]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: adding osdmap subscribe
authorNitzan Mordechai <nmordech@redhat.com>
Tue, 25 Jun 2024 09:06:45 +0000 (09:06 +0000)
committerNitzan Mordechai <nmordech@redhat.com>
Mon, 15 Jul 2024 11:11:16 +0000 (11:11 +0000)
when committed osdmap is complete, it will check if should restart.
in case we shouldn't restart but we are still active, we need
the next osdmap to continue the process.

Fixes: https://tracker.ceph.com/issues/66381
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
src/crimson/osd/osd.cc

index e75e4b2e36597498e07547c38b1912f843bc1bb8..591c1aca0e4936d7aa3426e48e6da8bc2820757a 100644 (file)
@@ -1183,6 +1183,13 @@ seastar::future<> OSD::committed_osd_maps(
       }
       if (should_restart()) {
         return 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 
+        */
+       return get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
       } else {
         return seastar::now();
       }