From c400ba1e26239e02f149d24d344a2eccb1cf9c6b Mon Sep 17 00:00:00 2001 From: John Spray Date: Wed, 7 Jan 2015 11:47:34 +0000 Subject: [PATCH] mon/MDSMonitor: respect MDSMAP_DOWN when promoting standbys Previously, a standby could become active even if 'cluster_down' had been run. This was awkward, because it would get you a "laggy or crashed" mds for the standby that was actually up and running, just being ignored because of cluster_down. Signed-off-by: John Spray --- src/mon/MDSMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index a8666f0270e85..25b22505531d1 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -1721,7 +1721,7 @@ void MDSMonitor::tick() // have a standby take over? set failed; pending_mdsmap.get_failed_mds_set(failed); - if (!failed.empty()) { + if (!failed.empty() && !pending_mdsmap.test_flag(CEPH_MDSMAP_DOWN)) { set::iterator p = failed.begin(); while (p != failed.end()) { mds_rank_t f = *p++; -- 2.39.5