RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39287 from david-z/wip-fix-join-fscid

Browse Source 
mon/MDSMonitor.cc: fix join fscid not applied with pending fsmap at boot
This commit is contained in:
Venky Shankar 2021-02-10 17:30:14 +05:30 committed by GitHub
commit e40a9f4caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/MDSMonitor.cc
View File

@ -665,7 +665,6 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
new_info.mds_features = m->get_mds_features();
new_info.state = MDSMap::STATE_STANDBY;
new_info.state_seq = seq;
pending.insert(new_info);
if (m->get_fs().size()) {
fs_cluster_id_t fscid = FS_CLUSTER_ID_NONE;
auto f = pending.get_filesystem(m->get_fs());
@ -674,6 +673,7 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
}
new_info.join_fscid = fscid;
}
pending.insert(new_info);
}
// initialize the beacon timer