]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: only send beacon on connect if active 14274/head
authorSage Weil <sage@redhat.com>
Fri, 31 Mar 2017 19:23:27 +0000 (15:23 -0400)
committerSage Weil <sage@redhat.com>
Fri, 31 Mar 2017 19:23:27 +0000 (15:23 -0400)
Otherwise the mon will just ignore it and we'll wait another
cycle.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index b476f4aaeaf271202a68d948019fe43870c2f0b0..067beb9ca8f02abed88fd54fdafc7080ee5e5386 100644 (file)
@@ -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