From: Sage Weil <sage@redhat.com>
Date: Mon, 15 May 2017 18:53:57 +0000 (-0400)
Subject: mon: adjust pgservice based on OSDMap require_luminous flag
X-Git-Tag: v12.1.0~288^2~96
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=db1b98157a6820a5485a13e63138b79d6ed33db1;p=ceph-ci.git

mon: adjust pgservice based on OSDMap require_luminous flag

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c32a613d880..9bc2e5cec2b 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -244,6 +244,7 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   get_locally_supported_monitor_commands(&cmds, &cmdsize);
   set_leader_supported_commands(cmds, cmdsize);
 
+  // note: OSDMonitor may update this based on the luminous flag.
   pgservice = mgrmon()->get_pg_stat_service();
 }
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6f736373aaa..1a5435d531a 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -23,6 +23,7 @@
 #include "Monitor.h"
 #include "MDSMonitor.h"
 #include "PGMonitor.h"
+#include "MgrMonitor.h"
 
 #include "MonitorDBStore.h"
 #include "Session.h"
@@ -339,6 +340,13 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
     }
   }
 
+  // make sure we're using the right pg service.. remove me post-luminous!
+  if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
+    mon->pgservice = mon->mgrmon()->get_pg_stat_service();
+  } else {
+    mon->pgservice = mon->pgmon()->get_pg_stat_service();
+  }
+
   // walk through incrementals
   MonitorDBStore::TransactionRef t;
   size_t tx_size = 0;
@@ -400,6 +408,13 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
       t->erase("mkfs", "osdmap");
     }
 
+    // make sure we're using the right pg service.. remove me post-luminous!
+    if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
+      mon->pgservice = mon->mgrmon()->get_pg_stat_service();
+    } else {
+      mon->pgservice = mon->pgmon()->get_pg_stat_service();
+    }
+
     if (tx_size > g_conf->mon_sync_max_payload_size*2) {
       mon->store->apply_transaction(t);
       t = MonitorDBStore::TransactionRef();