From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 18:24:05 +0000 (-0400)
Subject: osd: inline do_mon_report
X-Git-Tag: v10.0.1~26^2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d2e6b2ea89233f97d92fdf757297861ba621b44;p=ceph.git

osd: inline do_mon_report

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1c6d903fe6bc..25d86d8fecaa 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4022,8 +4022,15 @@ void OSD::tick()
 
     if (reset)
       monc->reopen_session();
-    else if (report)
-      do_mon_report();
+    else if (report) {
+      last_mon_report = now;
+
+      // do any pending reports
+      send_alive();
+      service.send_pg_temp();
+      send_failures();
+      send_pg_stats(now);
+    }
 
     map_lock.put_read();
   }
@@ -4357,20 +4364,6 @@ void OSD::RemoveWQ::_process(
 }
 // =========================================
 
-void OSD::do_mon_report()
-{
-  dout(7) << "do_mon_report" << dendl;
-
-  utime_t now(ceph_clock_now(cct));
-  last_mon_report = now;
-
-  // do any pending reports
-  send_alive();
-  service.send_pg_temp();
-  send_failures();
-  send_pg_stats(now);
-}
-
 void OSD::ms_handle_connect(Connection *con)
 {
   if (con->get_peer_type() == CEPH_ENTITY_TYPE_MON) {
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 66257f62dbe5..f829c58ea9df 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1973,8 +1973,6 @@ protected:
   float stats_ack_timeout;
   int outstanding_pg_stats; // how many stat updates haven't been acked yet
 
-  void do_mon_report();
-
   // -- boot --
   void start_boot();
   void _maybe_boot(epoch_t oldest, epoch_t newest);