From a2debbc26bd136cab8ac7d461703c81c0b7daff7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 7 Mar 2019 13:42:34 -0600 Subject: [PATCH] mon/MgrMonitor: only try to update always_on_modules if >= NAUTILUS Pre-nautilus mgrmap doesn't encode have this field, so we'll just loop. Signed-off-by: Sage Weil --- src/mon/MgrMonitor.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 586f64a526b60..e7608a1174b42 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -651,10 +651,12 @@ void MgrMonitor::on_active() if (mon->is_leader()) { mon->clog->debug() << "mgrmap e" << map.epoch << ": " << map; - if (pending_map.always_on_modules != always_on_modules) { + if (HAVE_FEATURE(mon->get_quorum_con_features(), SERVER_NAUTILUS) && + pending_map.always_on_modules != always_on_modules) { pending_map.always_on_modules = always_on_modules; - dout(4) << "always on modules changed " - << pending_map.get_always_on_modules() << dendl; + dout(4) << "always on modules changed, pending " + << pending_map.get_always_on_modules() + << " != wanted " << always_on_modules << dendl; propose_pending(); } } -- 2.39.5