Skip to content

Commit cfecf7c

Browse files
committed
mds/FSMap: fix join_fscid being incorrectly reset for active MDS during filesystem removal
Fix bug where active MDS daemons in remaining filesystems incorrectly have their join_fscid cleared to FS_CLUSTER_ID_NONE when any other filesystem is removed. The issue was caused by variable name shadowing in erase_filesystem() where the loop variable 'fscid' shadowed the function parameter 'fscid': Inside loop: if (info.join_fscid == fscid) compared against the loop variable (remaining FS ID) instead of parameter (removed FS ID) Renamed the loop variable to 'remaining_fscid' to eliminate the shadowing and ensure the comparison uses the correct filesystem ID. Reproducer: ../src/vstart.sh --new -x --localhost --bluestore FS=b ./bin/ceph osd pool create cephfs.${FS}.meta 64 64 replicated ./bin/ceph osd pool create cephfs.${FS}.data 64 64 replicated ./bin/ceph fs new ${FS} cephfs.${FS}.meta cephfs.${FS}.data ./bin/ceph config set mds.a mds_join_fs a ./bin/ceph config set mds.b mds_join_fs a ./bin/ceph fs fail ${FS} ./bin/ceph fs rm ${FS} --yes-i-really-mean-it Then from ./bin/ceph fs dump We can see join_fscid in all active mds filesystem 'a' are reset. Since there are standby mds with join_fscid=1 MDSMonitor think they have better affinity and trigger switch over. Fixes: https://tracker.ceph.com/issues/73183 Signed-off-by: ethanwu <[email protected]>
1 parent 31eb5e7 commit cfecf7c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/mds/FSMap.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ void FSMap::erase_filesystem(fs_cluster_id_t fscid)
12361236
});
12371237
}
12381238
}
1239-
for ([[maybe_unused]] auto& [fscid, fs] : filesystems) {
1239+
for ([[maybe_unused]] auto& [remaining_fscid, fs] : filesystems) {
12401240
for (auto& [gid, info] : fs.mds_map.get_mds_info()) {
12411241
if (info.join_fscid == fscid) {
12421242
modify_daemon(gid, [](auto& info) {

0 commit comments

Comments
 (0)