]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: harden standby_mds lookup
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Mar 2021 21:13:42 +0000 (14:13 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 16 Aug 2021 21:12:41 +0000 (14:12 -0700)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b8ad8a8c821ba57d64aa349a9da7117867b0f401)

src/mds/FSMap.cc

index 802124f9bc445248d1ed4b004c1e3a2277784a14..14b1cbedbfd7d44ce4a46098286954add80aab15 100644 (file)
@@ -910,7 +910,7 @@ void FSMap::promote(
     ceph_assert(mds_map.mds_info.at(standby_gid).state == MDSMap::STATE_STANDBY_REPLAY);
     ceph_assert(mds_map.mds_info.at(standby_gid).rank == assigned_rank);
   }
-  auto& info = mds_map.mds_info[standby_gid];
+  auto& info = mds_map.mds_info.at(standby_gid);
 
   if (mds_map.stopped.erase(assigned_rank)) {
     // The cluster is being expanded with a stopped rank
@@ -925,7 +925,7 @@ void FSMap::promote(
   }
   info.rank = assigned_rank;
   info.inc = epoch;
-  mds_roles[standby_gid] = filesystem.fscid;
+  mds_roles.at(standby_gid) = filesystem.fscid;
 
   // Update the rank state in Filesystem
   mds_map.in.insert(assigned_rank);