osd: just send alive when it is queue

No need to futz with last_mon_report or resend it again later.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f325f2ba19225dd77aee8ba12b582865e54621d6..f0baac9e672c8b27a9da007c5dca0c247d6732c3 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4027,7 +4027,6 @@ void OSD::tick()
       last_mon_report = now;
 
       // do any pending reports
-      send_alive();
       service.send_pg_temp();
       send_failures();
       send_pg_stats(now);
@@ -4383,7 +4382,7 @@ void OSD::ms_handle_connect(Connection *con)
       send_alive();
       service.send_pg_temp();
       send_failures();
-      send_pg_stats(ceph_clock_now(cct));
+      send_pg_stats(now);
 
       monc->sub_want("osd_pg_creates", 0, CEPH_SUBSCRIBE_ONETIME);
       monc->sub_want("osdmap", osdmap->get_epoch(), CEPH_SUBSCRIBE_ONETIME);
@@ -4639,9 +4638,6 @@ void OSD::queue_want_up_thru(epoch_t want)
             << ", currently " << cur
             << dendl;
     up_thru_wanted = want;
-
-    // expedite, a bit.  WARNING this will somewhat delay other mon queries.
-    last_mon_report = ceph_clock_now(cct);
     send_alive();
   } else {
     dout(10) << "queue_want_up_thru want " << want << " <= queued " << up_thru_wanted