From: Kefu Chai <kchai@redhat.com>
Date: Thu, 19 Sep 2019 08:26:56 +0000 (+0800)
Subject: crimson/osd: do not cluster_msgr.set_myaddrs() in background
X-Git-Tag: v15.1.0~1487^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b82fd0320db96a1684a3a337839a45507ad11459;p=ceph-ci.git

crimson/osd: do not cluster_msgr.set_myaddrs() in background

we should do the initialization in foreground

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

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 39369463c9f..ca5ababac3d 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -264,8 +264,11 @@ seastar::future<> OSD::start()
     if (auto [addrs, changed] =
         replace_unknown_addrs(cluster_msgr.get_myaddrs(),
                               public_msgr.get_myaddrs()); changed) {
-      cluster_msgr.set_myaddrs(addrs);
+      return cluster_msgr.set_myaddrs(addrs);
+    } else {
+      return seastar::now();
     }
+  }).then([this] {
     return heartbeat->start(public_msgr.get_myaddrs(),
                             cluster_msgr.get_myaddrs());
   }).then([this] {