Merge pull request ceph#65726 from xxhdx1985126/wip-73317

crimson/osd: always ask for the newest osdmap

Reviewed-by: Matan Breizman <[email protected]>

Author: Matan-B

src/crimson/osd/osd.cc

@@ -1286,19 +1286,20 @@ seastar::future<> OSD::committed_osd_maps(
     }
   }
 
+  if (!pg_shard_manager.is_stopping()) {
+    /*
+     * TODO: Missing start_waiting_for_healthy() counterpart.
+     * Only subscribe to the next map until implemented.
+     * See https://tracker.ceph.com/issues/66832
+    */
+    co_await get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
+  }
   if (pg_shard_manager.is_active()) {
     INFO("osd.{}: now active", whoami);
     if (!osdmap->exists(whoami) || osdmap->is_stop(whoami)) {
       co_await shutdown();
     } else if (should_restart()) {
       co_await restart();
-    } else if (!pg_shard_manager.is_stopping()) {
-      /*
-       * TODO: Missing start_waiting_for_healthy() counterpart.
-       * Only subscribe to the next map until implemented.
-       * See https://tracker.ceph.com/issues/66832
-      */
-      co_await get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
     }
   } else if (pg_shard_manager.is_preboot()) {
     INFO("osd.{}: now preboot", whoami);