Merge PR #32585 into master

* refs/pull/32585/head: MDSMonitor: handle standby already without fscid Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Jan 14, 2020 · b5d145f · b5d145f
2 parents df9833e + 41589d4
commit b5d145f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -186,7 +186,7 @@ class FSMap {
    */
   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