crimson/admin/osd_admin: DumpInFlightOpsHook to await active

Signed-off-by: Matan Breizman <[email protected]>

Author: Matan-B

src/crimson/admin/osd_admin.cc

@@ -578,12 +578,15 @@ class DumpInFlightOpsHook : public AdminSocketHook {
     auto *f = fref.get();
     f->open_object_section("ops_in_flight");
     f->open_array_section("ops_in_flight");
-    return pg_shard_manager.invoke_on_each_shard_seq([f](const auto &shard_services) {
-      return shard_services.dump_ops_in_flight(f);
-    }).then([fref=std::move(fref)]() mutable {
-      fref->close_section();
-      fref->close_section();
-      return seastar::make_ready_future<tell_result_t>(std::move(fref));
+    return pg_shard_manager.when_active()
+    .then([this, f, fref=std::move(fref)]() mutable {
+      return pg_shard_manager.invoke_on_each_shard_seq([f](const auto &shard_services) {
+        return shard_services.dump_ops_in_flight(f);
+      }).then([fref=std::move(fref)]() mutable {
+        fref->close_section();
+        fref->close_section();
+        return seastar::make_ready_future<tell_result_t>(std::move(fref));
+      });
     });
   }
 private:

src/crimson/osd/pg_shard_manager.h

@@ -121,7 +121,7 @@ class PGShardManager {
   FORWARD(set_booting, set_booting, get_shard_services().local_state.osd_state)
   FORWARD(set_stopping, set_stopping, get_shard_services().local_state.osd_state)
   FORWARD(set_active, set_active, get_shard_services().local_state.osd_state)
-  FORWARD(when_active, when_active, get_shard_services().local_state.osd_state)
+  FORWARD_CONST(when_active, when_active, get_shard_services().local_state.osd_state)
   FORWARD_CONST(get_osd_state_string, to_string, get_shard_services().local_state.osd_state)
 
   FORWARD(got_map, got_map, get_shard_services().local_state.osdmap_gate)