update ceph source to reef 18.1.2

[ceph.git] / ceph / src / mds / FSMap.cc

diff --git a/ceph/src/mds/FSMap.cc b/ceph/src/mds/FSMap.cc
index 217a1e3307c544abd6d0589902212f2e00b724be..b9ae05ac0f62246831f30ed0d7ed6c9d0df8b1ae 100644 (file)
--- a/ceph/src/mds/FSMap.cc
+++ b/ceph/src/mds/FSMap.cc
@@ -1090,10 +1090,13 @@ std::vector<mds_gid_t> FSMap::stop(mds_gid_t who)
     if (other_info.rank == info.rank
         && other_info.state == MDSMap::STATE_STANDBY_REPLAY) {
       standbys.push_back(other_gid);
-      erase(other_gid, 0);
     }
   }
 
+  for (const auto &other_gid : standbys) {
+    erase(other_gid, 0);
+  }
+
   fs->mds_map.mds_info.erase(who);
   mds_roles.erase(who);