From: Nitzan Mordechai <nmordech@redhat.com>
Date: Tue, 25 Jun 2024 09:06:45 +0000 (+0000)
Subject: crimson/osd: adding osdmap subscribe
X-Git-Tag: testing/wip-xiubli-testing-20240802.055215-squid~25^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d29940502ba3320f8b36b5a7108031526a8acc89;p=ceph-ci.git

crimson/osd: adding osdmap subscribe

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)
---

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index b2621f0bf8f..35e685b4352 100644
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -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();
       }