diff options
| author | Kefu Chai <kchai@redhat.com> | 2019-09-19 10:26:56 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2019-09-19 10:31:26 +0200 |
| commit | b82fd0320db96a1684a3a337839a45507ad11459 (patch) | |
| tree | 8be567cb650e63eb5dbd61c83dc807bb8fa4187b /src/crimson | |
| parent | crimson/net: avoid warning about signed comparison with enum classes (diff) | |
| download | ceph-b82fd0320db96a1684a3a337839a45507ad11459.tar.xz ceph-b82fd0320db96a1684a3a337839a45507ad11459.zip | |
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>
Diffstat (limited to 'src/crimson')
| -rw-r--r-- | src/crimson/osd/osd.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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] { |