From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Mar 2019 19:42:34 +0000 (-0600)
Subject: mon/MgrMonitor: only try to update always_on_modules if >= NAUTILUS
X-Git-Tag: v14.1.1~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2debbc26bd136cab8ac7d461703c81c0b7daff7;p=ceph.git

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 <sage@redhat.com>
---

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();
     }
   }