From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 29 Jan 2025 12:34:55 +0000 (+0530)
Subject: cephfs,mon: rename variable to a better name
X-Git-Tag: testing/wip-jcollin-testing-20251001.040850-reef~1^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=968e7aa55cd7e5dea30ff9151eeb98cb8829bae5;p=ceph-ci.git

cephfs,mon: rename variable to a better name

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit cf68e49597dc065d375666d0e4cb237cef223419)

Conflicts:
src/mon/FSCommands.cc
- The region was to be applied in region use "std::vector" to a declare
  a variable but main branch uses "vector" instead. Using either makes
  no difference since because vector has been imported in to the
  namespace.
---

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 3d394f6c2f1..b60ec08ebd5 100644
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -130,15 +130,15 @@ class FailHandler : public FileSystemCommandHandler
     };
     fsmap.modify_filesystem(fs->fscid, std::move(f));
 
-    std::vector<mds_gid_t> to_fail;
-    for (const auto& p : fs->mds_map.get_mds_info()) {
-      to_fail.push_back(p.first);
+    vector<mds_gid_t> mds_gids_to_fail;
+    for (const auto& p : fsp->get_mds_map().get_mds_info()) {
+      mds_gids_to_fail.push_back(p.first);
     }
 
-    for (const auto& gid : to_fail) {
+    for (const auto& gid : mds_gids_to_fail) {
       mon->mdsmon()->fail_mds_gid(fsmap, gid);
     }
-    if (!to_fail.empty()) {
+    if (!mds_gids_to_fail.empty()) {
       mon->osdmon()->propose_pending();
     }