From 9fa8d2d1bd4a8cf56fdebae484bee35c3930fb62 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Jan 2014 11:29:56 -0800 Subject: [PATCH] mon/MDSMonitor: do not generate mdsmaps from already-laggy mds There is one path where a mds that is not sending its beacon (e.g., because it is not running at all) will lead to proposal of new mdsmaps. Fix it. Backport: emperor, dumpling Signed-off-by: Sage Weil (cherry picked from commit 584c2dd6bea3fe1a3c7f306874c054ce0cf0d2b5) --- src/mon/MDSMonitor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 1c34a766e5ff2..baff01582c9bd 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -1150,14 +1150,15 @@ void MDSMonitor::tick() << " " << ceph_mds_state_name(info.state) << " (laggy)" << dendl; pending_mdsmap.mds_info.erase(gid); + do_propose = true; } else if (!info.laggy()) { dout(10) << " marking " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " laggy" << dendl; info.laggy_since = now; + do_propose = true; } last_beacon.erase(gid); - do_propose = true; } } -- 2.39.5