RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15129 from ukernel/wip-mds-standby-for-rank

Browse Source 
mon/MDSMonitor: respect mds_standby_for_rank config

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
John Spray 2017-05-24 16:37:03 +01:00 committed by GitHub
commit db6890e2c9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mds/FSMap.cc
View File

@ -669,8 +669,8 @@ mds_gid_t FSMap::find_standby_for(mds_role_t role, const std::string& name) cons
return result;
}
mds_gid_t FSMap::find_unused(fs_cluster_id_t fscid,
bool force_standby_active) const {
mds_gid_t FSMap::find_unused_for(mds_role_t role,
bool force_standby_active) const {
for (const auto &i : standby_daemons) {
const auto &gid = i.first;
const auto &info = i.second;
@ -680,7 +680,10 @@ mds_gid_t FSMap::find_unused(fs_cluster_id_t fscid,
continue;
if (info.standby_for_fscid != FS_CLUSTER_ID_NONE &&
info.standby_for_fscid != fscid)
info.standby_for_fscid != role.fscid)
continue;
if (info.standby_for_rank != MDS_RANK_NONE &&
info.standby_for_rank != role.rank)
continue;
// To be considered 'unused' a daemon must either not
@ -699,7 +702,7 @@ mds_gid_t FSMap::find_replacement_for(mds_role_t role, const std::string& name,
if (standby)
return standby;
else
return find_unused(role.fscid, force_standby_active);
return find_unused_for(role, force_standby_active);
}
void FSMap::sanity() const

2
src/mds/FSMap.h
View File

@ -468,7 +468,7 @@ public:
mds_gid_t find_standby_for(mds_role_t mds, const std::string& name) const;
mds_gid_t find_unused(fs_cluster_id_t fscid, bool force_standby_active) const;
mds_gid_t find_unused_for(mds_role_t mds, bool force_standby_active) const;
mds_gid_t find_replacement_for(mds_role_t mds, const std::string& name,
bool force_standby_active) const;