From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 19 Apr 2018 02:44:11 +0000 (+0800)
Subject: mon: respect standby_for_fscid when choosing standby replay mds
X-Git-Tag: v12.2.6~24^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22603%2Fhead;p=ceph.git

mon: respect standby_for_fscid when choosing standby replay mds

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e3a38e9e89577f54c8a52fa32b3e0d14fe8e7088)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 6db751d50b6b..21d939331f94 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -2226,6 +2226,10 @@ bool MDSMonitor::maybe_promote_standby(std::shared_ptr<Filesystem> &fs)
 
       // check everyone
       for (const auto &p : pending.filesystems) {
+	if (info.standby_for_fscid != FS_CLUSTER_ID_NONE &&
+	    info.standby_for_fscid != p.first)
+	  continue;
+
 	bool assigned = false;
         const auto &fs = p.second;
         const MDSMap &mds_map = fs->mds_map;