From 632f9acadebaa7d26aee9aebc4d1c5a5a4d47be5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 24 Jun 2021 14:26:07 +0800 Subject: [PATCH] crimson/osd: shutdown if osdmap forces us to do so mirror the change introduced by 5dbae13ce0f5b0104ab43e0ccfe94f832d0e1268 in classic osd. 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 74ca49ea45132..d1673acce657a 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -1087,7 +1087,8 @@ seastar::future<> OSD::committed_osd_maps(version_t first, }).then([m, this] { if (state.is_active()) { logger().info("osd.{}: now active", whoami); - if (!osdmap->exists(whoami)) { + if (!osdmap->exists(whoami) || + osdmap->is_stop(whoami)) { return shutdown(); } if (should_restart()) { -- 2.39.5