From 6acc4a7ce18e6a12fa694627968baa00f09ff3b7 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 12 Jul 2021 16:51:54 +0000 Subject: [PATCH] crimson/osd: improve debugs and clean up OSD activation. Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/osd.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 6697d1bd9f42..a870166db7cf 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -1067,10 +1067,13 @@ seastar::future<> OSD::committed_osd_maps(version_t first, } }); }).then([m, this] { - if (osdmap->is_up(whoami) && - osdmap->get_addrs(whoami) == public_msgr->get_myaddrs() && - bind_epoch < osdmap->get_up_from(whoami)) { - if (state.is_booting()) { + if (osdmap->is_up(whoami)) { + const auto up_from = osdmap->get_up_from(whoami); + logger().info("osd.{}: map e {} marked me up: up_from {}, bind_epoch {}, state {}", + whoami, osdmap->get_epoch(), up_from, bind_epoch, state); + if (bind_epoch < up_from && + osdmap->get_addrs(whoami) == public_msgr->get_myaddrs() && + state.is_booting()) { logger().info("osd.{}: activating...", whoami); state.set_active(); beacon_timer.arm_periodic( @@ -1078,7 +1081,7 @@ seastar::future<> OSD::committed_osd_maps(version_t first, tick_timer.arm_periodic( std::chrono::seconds(TICK_INTERVAL)); } - } else if (!osdmap->is_up(whoami)) { + } else { if (state.is_prestop()) { got_stop_ack(); return seastar::now(); -- 2.47.3