From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Mar 2017 19:23:27 +0000 (-0400)
Subject: osd: only send beacon on connect if active
X-Git-Tag: v12.0.2~229^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b0d7e13435ec70c7e741159f50d31593806c8b62;p=ceph-ci.git

osd: only send beacon on connect if active

Otherwise the mon will just ignore it and we'll wait another
cycle.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b476f4aaeaf..067beb9ca8f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4982,7 +4982,9 @@ void OSD::ms_handle_connect(Connection *con)
       send_pg_stats(now);
 
       map_lock.put_read();
-      send_beacon(ceph::coarse_mono_clock::now());
+      if (is_active()) {
+	send_beacon(ceph::coarse_mono_clock::now());
+      }
     }
 
     // full map requests may happen while active or pre-boot