Merge pull request ceph#65640 from ethanwu-syno/fix-join_fscid_reset_during_fs_removal

rishabh-d-dave · web-flow · commit f8aa41381507 · 2025-10-03T16:48:21.000+05:30
mds/FSMap: fix join_fscid being incorrectly reset for active MDS during filesystem removal

Reviewed-by: Rishabh Dave &lt;ridave@redhat.com&gt;
Reviewed-by: Patrick Donnelly &lt;pdonnell@redhat.com&gt;
diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
@@ -1236,7 +1236,7 @@ void FSMap::erase_filesystem(fs_cluster_id_t fscid)
       });
     }
   }
-  for ([[maybe_unused]] auto& [fscid, fs] : filesystems) {
+  for ([[maybe_unused]] auto& [remaining_fscid, fs] : filesystems) {
     for (auto& [gid, info] : fs.mds_map.get_mds_info()) {
       if (info.join_fscid == fscid) {
         modify_daemon(gid, [](auto& info) {

Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@ void FSMap::erase_filesystem(fs_cluster_id_t fscid)`
`1236`	`1236`	`});`
`1237`	`1237`	`}`
`1238`	`1238`	`}`
`1239`		`- for ([[maybe_unused]] auto& [fscid, fs] : filesystems) {`
	`1239`	`+ for ([[maybe_unused]] auto& [remaining_fscid, fs] : filesystems) {`
`1240`	`1240`	`for (auto& [gid, info] : fs.mds_map.get_mds_info()) {`
`1241`	`1241`	`if (info.join_fscid == fscid) {`
`1242`	`1242`	`modify_daemon(gid, [](auto& info) {`