]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: shutdown if osdmap forces us to do so
authorKefu Chai <kchai@redhat.com>
Thu, 24 Jun 2021 06:26:07 +0000 (14:26 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 Jun 2021 08:07:29 +0000 (16:07 +0800)
mirror the change introduced by 5dbae13ce0f5b0104ab43e0ccfe94f832d0e1268
in classic osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/osd.cc

index 74ca49ea451324cb64b82bf0759fbd3d92d32198..d1673acce657aaacfc1a97b879f78a6cde0e6876 100644 (file)
@@ -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()) {