]> 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)
committerMatan Breizman <mbreizma@redhat.com>
Mon, 29 Jul 2024 12:52:05 +0000 (15:52 +0300)
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>
(cherry picked from commit 74297e6abac2868afc5edc6765c2284319091de2)

src/crimson/osd/osd.cc

index b2621f0bf8f1e225782d0e584108ba85daac22d9..35e685b4352f6c102e30e1c99041446d9b76b74e 100644 (file)
@@ -1178,6 +1178,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();
       }