osd/scrub: fix blocked scrub accounting

The labeled perf counter <label>_chunk_busy is incremented whenever
the selected scrub chunk range is not available, and the scrubber
must wait for ongoing I/O to complete. This is as it should be.

<label>_locked_object should not be incremented in parallel,
serving no purpose. Instead - it should count the times the
'wait for chunk to be free' takes longer than the configured
grace period.

Fixes: https://tracker.ceph.com/issues/73415
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/osd/scrubber/scrub_machine.cc b/src/osd/scrubber/scrub_machine.cc
index 2d21c8d25c84d7cdd879bf97bd14430503d4dcd5..76be5a9f5a0225665e7c68f032412b738e53aee5 100644 (file)
--- a/src/osd/scrubber/scrub_machine.cc
+++ b/src/osd/scrubber/scrub_machine.cc
@@ -383,7 +383,6 @@ RangeBlocked::RangeBlocked(my_context ctx)
     m_timeout_token = machine.schedule_timer_event_after<RangeBlockedAlarm>(
       grace);
   }
-  context<Session>().m_perf_set->inc(scrbcnt_blocked);
 }
 
 sc::result RangeBlocked::react(const RangeBlockedAlarm&)
@@ -402,6 +401,7 @@ sc::result RangeBlocked::react(const RangeBlockedAlarm&)
     << ")";
 
   scrbr->set_scrub_blocked(utime_t{now_c, 0});
+  context<Session>().m_perf_set->inc(scrbcnt_blocked);
   return discard_event();
 }