From 05f09420f73b0c1d571061c30d889cf888b42ccf Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 29 Jan 2019 19:20:05 +0800 Subject: [PATCH] crimson/osd: fix boot process * send my client addresses to mon * always update osdmap with the latest one Signed-off-by: Kefu Chai --- src/crimson/osd/osd.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 71eee16173c3..b69ba4d5522e 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -185,7 +185,7 @@ seastar::future<> OSD::_send_boot() entity_addrvec_t hb_back_addrs; entity_addrvec_t hb_front_addrs; - entity_addrvec_t cluster_addrs; + entity_addrvec_t cluster_addrs = cluster_msgr->get_myaddrs(); auto m = make_message(superblock, osdmap->get_epoch(), @@ -450,6 +450,7 @@ seastar::future<> OSD::committed_osd_maps(version_t first, return seastar::parallel_for_each(boost::irange(first, last + 1), [this](epoch_t cur) { return get_map(cur).then([this](seastar::lw_shared_ptr o) { + osdmap = o; if (up_epoch != 0 && osdmap->is_up(whoami) && osdmap->get_addrs(whoami) == client_msgr->get_myaddrs()) { -- 2.47.3