From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Sep 2017 18:52:06 +0000 (-0400)
Subject: mon/MgrStatMonitor: drop obsolete preluminous hack
X-Git-Tag: v13.0.1~861^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6af91c6721f6c33ad82c0dbde1e1c415fc283a16;p=ceph-ci.git

mon/MgrStatMonitor: drop obsolete preluminous hack

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

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index 2e26015c7cd..7c2f97078ac 100644
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -62,10 +62,6 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap)
 void MgrStatMonitor::update_logger()
 {
   dout(20) << __func__ << dendl;
-  if (mon->osdmon()->osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) {
-    dout(20) << "yielding cluster perfcounter updates to pgmon" << dendl;
-    return;
-  }
 
   mon->cluster_logger->set(l_cluster_osd_bytes, digest.osd_sum.kb * 1024ull);
   mon->cluster_logger->set(l_cluster_osd_bytes_used,