From e6be93355e9ad01d8259817752cdd937ca091d6f Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 17 May 2017 16:40:22 +0800 Subject: [PATCH] mon/MDSMonitor: respect mds_standby_for_rank config Signed-off-by: "Yan, Zheng" --- src/mds/FSMap.cc | 11 +++++++---- src/mds/FSMap.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc index 35c8093a380af..5d04bc65fff92 100644 --- a/src/mds/FSMap.cc +++ b/src/mds/FSMap.cc @@ -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 diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h index 881281edca17c..3d389c48885b5 100644 --- a/src/mds/FSMap.h +++ b/src/mds/FSMap.h @@ -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; -- 2.39.5