From 020b29961303b12224524ddf78c0c6763a61242e Mon Sep 17 00:00:00 2001 From: Mike Ryan Date: Wed, 27 Jun 2012 14:14:30 -0700 Subject: [PATCH] pg: report scrub status Signed-off-by: Mike Ryan --- src/osd/PG.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index a7479d3c78b74..57fe824bf2968 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -4319,6 +4319,20 @@ boost::statechart::result PG::RecoveryState::Active::react(const QueryState& q) q.f->close_section(); } + q.f->open_object_section("scrub"); + q.f->dump_stream("scrub_epoch_start") << pg->scrub_epoch_start; + q.f->dump_int("scrub_active", pg->scrub_active); + q.f->dump_int("scrub_block_writes", pg->scrub_block_writes); + q.f->dump_int("finalizing_scrub", pg->finalizing_scrub); + q.f->dump_int("scrub_waiting_on", pg->scrub_waiting_on); + q.f->open_array_section("scrub_waiting_on_whom"); + for (set::iterator p = pg->scrub_waiting_on_whom.begin(); + p != pg->scrub_waiting_on_whom.end(); + ++p) { + q.f->dump_int("osd", *p); + } + q.f->close_section(); + q.f->close_section(); return forward_event(); } @@ -4398,9 +4412,12 @@ boost::statechart::result PG::RecoveryState::ReplicaActive::react(const MQuery& boost::statechart::result PG::RecoveryState::ReplicaActive::react(const QueryState& q) { + PG *pg = context< RecoveryMachine >().pg; + q.f->open_object_section("state"); q.f->dump_string("name", state_name); q.f->dump_stream("enter_time") << enter_time; + q.f->dump_int("finalizing_scrub", pg->finalizing_scrub); q.f->close_section(); return forward_event(); } -- 2.39.5