osd/PG: debug scrub range

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 4ecc8fbbc9b667861b23fde0ac1174503a816ad5..53b5a2a141764536ec14e046f3b6b0f250e71561 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4358,7 +4358,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
   int ret;
 
   while (!done) {
-    dout(20) << "scrub state " << Scrubber::state_string(scrubber.state) << dendl;
+    dout(20) << "scrub state " << Scrubber::state_string(scrubber.state)
+            << " [" << scrubber.start << "," << scrubber.end << ")" << dendl;
 
     switch (scrubber.state) {
       case PG::Scrubber::INACTIVE:
@@ -4604,6 +4605,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
         ceph_abort();
     }
   }
+  dout(20) << "scrub final state " << Scrubber::state_string(scrubber.state)
+          << " [" << scrubber.start << "," << scrubber.end << ")" << dendl;
 }
 
 void PG::scrub_clear_state()

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index df25ddf8b0d9d36eb07c2002f72a7655d8923054..82472820167eea527dc76293e4bf45520e654eec 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -7294,7 +7294,12 @@ void PrimaryLogPG::apply_stats(
 
   if (is_primary() && scrubber.active) {
     if (soid < scrubber.start) {
+      dout(20) << __func__ << " " << soid << " < [" << scrubber.start
+              << "," << scrubber.end << ")" << dendl;
       scrub_cstat.add(delta_stats);
+    } else {
+      dout(20) << __func__ << " " << soid << " >= [" << scrubber.start
+              << "," << scrubber.end << ")" << dendl;
     }
   }
 }