From d09c87bf84233656c1d3c4e0e7f4566de780c326 Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Mon, 10 Aug 2020 19:51:12 -0700
Subject: [PATCH] osd: Move scrubber info out of recovery_state and add fields
 to scrubber::dump()

Add scrubber::dump() function which is a more obvious place when adding fields
Indicate that the scrubber info in recovery_state is deprecated

Signed-off-by: David Zafman <dzafman@redhat.com>
---
 src/osd/PG.cc           | 43 +++++++++++++++++++++++++++++++++++++++++
 src/osd/PG.h            |  1 +
 src/osd/PrimaryLogPG.cc |  4 ++++
 3 files changed, 48 insertions(+)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 8e48546ac98a5..3d220732ccc79 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3773,12 +3773,54 @@ void PG::handle_initialize(PeeringCtx &rctx)
   recovery_state.handle_event(evt, &rctx);
 }
 
+void PG::Scrubber::dump(Formatter *f)
+{
+  f->open_object_section("scrubber");
+  f->dump_stream("epoch_start") << epoch_start;
+  f->dump_bool("active", active);
+  if (active) {
+    f->dump_string("state", state_string(state));
+    f->dump_stream("start") << start;
+    f->dump_stream("end") << end;
+    f->dump_stream("max_end") << max_end;
+    f->dump_stream("subset_last_update") << subset_last_update;
+    f->dump_bool("deep", deep);
+    f->dump_bool("must_scrub", must_scrub);
+    f->dump_bool("must_deep_scrub", must_deep_scrub);
+    f->dump_bool("must_repair", must_repair);
+    f->dump_bool("need_auto", need_auto);
+    f->dump_bool("req_scrub", req_scrub);
+    f->dump_bool("time_for_deep", time_for_deep);
+    f->dump_bool("auto_repair", auto_repair);
+    f->dump_bool("check_repair", check_repair);
+    f->dump_bool("deep_scrub_on_error", deep_scrub_on_error);
+    f->dump_stream("scrub_reg_stamp") << scrub_reg_stamp; //utime_t
+    f->dump_stream("waiting_on_whom") << waiting_on_whom; //set<pg_shard_t>
+    f->dump_unsigned("priority", priority);
+    f->dump_int("shallow_errors", shallow_errors);
+    f->dump_int("deep_errors", deep_errors);
+    f->dump_int("fixed", fixed);
+    {
+      f->open_array_section("waiting_on_whom");
+      for (set<pg_shard_t>::iterator p = waiting_on_whom.begin();
+	   p != waiting_on_whom.end();
+	   ++p) {
+	f->dump_stream("shard") << *p;
+      }
+      f->close_section();
+    }
+  }
+  f->close_section();
+}
+
 void PG::handle_query_state(Formatter *f)
 {
   dout(10) << "handle_query_state" << dendl;
   PeeringState::QueryState q(f);
   recovery_state.handle_event(q, 0);
 
+  // This code has moved to after the close of recovery_state array.
+  // I don't think that scrub is a recovery state
   if (is_primary() && is_active()) {
     f->open_object_section("scrub");
     f->dump_stream("scrubber.epoch_start") << scrubber.epoch_start;
@@ -3798,6 +3840,7 @@ void PG::handle_query_state(Formatter *f)
       }
       f->close_section();
     }
+    f->dump_string("comment", "DEPRECATED - may be removed in the next release");
     f->close_section();
   }
 }
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 53eb3cb6820be..2b17ba52c537d 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1191,6 +1191,7 @@ public:
 
     void create_results(const hobject_t& obj);
     void cleanup_store(ObjectStore::Transaction *t);
+    void dump(ceph::Formatter *f);
   } scrubber;
 
 protected:
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 3bba568ce4c39..fbcb64c72e84f 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1006,6 +1006,10 @@ void PrimaryLogPG::do_command(
     handle_query_state(f.get());
     f->close_section();
 
+    if (is_primary() && is_active()) {
+      scrubber.dump(f.get());
+    }
+
     f->open_object_section("agent_state");
     if (agent_state)
       agent_state->dump(f.get());
-- 
2.39.5