From 1e50fb494cecfc63ab526d9acc490086535e38d2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 16 Jul 2017 14:47:44 -0400 Subject: [PATCH] mon/MgrMonitor: only induce mgr epoch shortly after mkfs For early clusters, if there isn't an active manager, we eventually want to trigger a health warning by rolling over the mgrmap epoch. We don't want to do that if we have no active/available manager after that. Fix by checking ever_had_active_mgr here. Signed-off-by: Sage Weil --- src/mon/MgrMonitor.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 52e1b0b29f2e6..5857c5b8487e5 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -490,6 +490,7 @@ void MgrMonitor::tick() } if (!pending_map.available && + !ever_had_active_mgr && should_warn_about_mgr_down() != HEALTH_OK) { dout(10) << " exceeded mon_mgr_mkfs_grace " << g_conf->mon_mgr_mkfs_grace << " seconds" << dendl; -- 2.47.3