From: Kefu Chai <kchai@redhat.com>
Date: Sun, 16 Feb 2020 06:11:18 +0000 (+0800)
Subject: crimson/osd: send beacon only if active
X-Git-Tag: v15.1.1~398^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5f69304451d7b6e642e9942a9ee306bfdb52e1a;p=ceph.git

crimson/osd: send beacon only if active

mimic the behavior of classic osd, and this behavior does make sense.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 21faffd3bff9..483777628a19 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -1008,6 +1008,9 @@ seastar::future<> OSD::shutdown()
 
 seastar::future<> OSD::send_beacon()
 {
+  if (!state.is_active()) {
+    return seastar::now();
+  }
   // FIXME: min lec should be calculated from pg_stat
   //        and should set m->pgs
   epoch_t min_last_epoch_clean = osdmap->get_epoch();