MDSMonitor: handle standby already without fscid

If prepare_beacon is called on an existing standby's beacon, then it
will handle any changes to get_fs() but if there's not been a change to
the empty case, the MDSMonitor will assert.

Fixes: https://tracker.ceph.com/issues/43542
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index acd748f98895680cc30dd6423f7750a0008847ea..ab81c8d2ee8cb3bd137dec54ac8f8dbd44ad8fa0 100644 (file)
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -1057,10 +1057,10 @@ void FSMap::adjust_standby_fscid(mds_gid_t standby_gid,
   standby_daemon_fscid.at(standby_gid) = fscid;
 }
 
-void FSMap::clear_standby_fscid(mds_gid_t standby_gid)
+std::size_t FSMap::clear_standby_fscid(mds_gid_t standby_gid)
 {
   auto count = standby_daemon_fscid.erase(standby_gid);
-  ceph_assert(count);
+  return count;
 }
 
 std::vector<mds_gid_t> FSMap::stop(mds_gid_t who)

diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h
index 720b9c82a3c10b36638f519b0242c343622f3251..1c89bcd36eda9159ac9a493048a0c44b4c15f70e 100644 (file)
--- a/src/mds/FSMap.h
+++ b/src/mds/FSMap.h
@@ -186,7 +186,7 @@ public:
    */
   void adjust_standby_fscid(mds_gid_t standby_gid,
                            fs_cluster_id_t fscid);
-  void clear_standby_fscid(mds_gid_t standby_gid);
+  std::size_t clear_standby_fscid(mds_gid_t standby_gid);
 
   /**
    * Assign an MDS cluster standby replay rank to a standby daemon