From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 6 Apr 2021 15:20:54 +0000 (-0700)
Subject: mds: only update beacon epoch if newer
X-Git-Tag: v16.2.6~47^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99784dbe3dc83b695132bc3a32cf0f27674e8f55;p=ceph.git

mds: only update beacon epoch if newer

This is a defensive programming change. We don't want the beacon epoch
to ever go backwards.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0256ae010f61520a67f95fcd3e8522784ea56f8b)
---

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index 89654759187..e47c7a44758 100644
--- a/src/mds/Beacon.cc
+++ b/src/mds/Beacon.cc
@@ -233,7 +233,7 @@ void Beacon::_notify_mdsmap(const MDSMap &mdsmap)
 {
   ceph_assert(mdsmap.get_epoch() >= epoch);
 
-  if (mdsmap.get_epoch() != epoch) {
+  if (mdsmap.get_epoch() >= epoch) {
     epoch = mdsmap.get_epoch();
     compat = MDSMap::get_compat_set_default();
     compat.merge(mdsmap.compat);