From: Ronen Friedman <rfriedma@redhat.com>
Date: Wed, 25 Dec 2024 15:12:10 +0000 (-0600)
Subject: osd/scrub: convey 'reserving replicas' status in query results
X-Git-Tag: v20.0.0~456^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=656408d3685aae3992ff8b4c00702a1523595540;p=ceph.git

osd/scrub: convey 'reserving replicas' status in query results

... and not just in 'pg dump' output.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index ae8d6c94f243..f23e810ab5b9 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -2417,6 +2417,16 @@ void PgScrubber::dump_active_scrubber(ceph::Formatter* f) const
   } else {
     f->dump_string("schedule", "scrubbing");
   }
+  const auto maybe_register = m_fsm->get_reservation_status();
+  if (maybe_register && maybe_register->m_num_to_reserve != 0) {
+    f->dump_bool("is_reserving_replicas", true);
+    f->dump_int("osd_to_respond", maybe_register->m_osd_to_respond);
+    f->dump_int("duration_seconds", maybe_register->m_duration_seconds);
+    f->dump_int("requested_in_order", maybe_register->m_ordinal_of_requested_replica);
+    f->dump_int("num_to_reserve", maybe_register->m_num_to_reserve);
+  } else {
+    f->dump_bool("is_reserving_replicas", false);
+  }
 }
 
 pg_scrubbing_status_t PgScrubber::get_schedule() const