]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: only dec_scrubs_active if we were active
authorSage Weil <sage@inktank.com>
Fri, 21 Dec 2012 05:45:09 +0000 (21:45 -0800)
committerSage Weil <sage@inktank.com>
Fri, 21 Dec 2012 05:45:09 +0000 (21:45 -0800)
This fixes a bug that puts scrubs_active negative.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/PG.cc

index c5d3a1f9aa51b4ae23e0e4b40e57790f5a4ed566..aab54f862225f9e4768e4d8ac4de52eec6a36cfa 100644 (file)
@@ -3975,7 +3975,8 @@ void PG::scrub_clear_state()
   update_stats();
 
   // active -> nothing.
-  osd->dec_scrubs_active();
+  if (scrubber.active)
+    osd->dec_scrubs_active();
 
   requeue_ops(waiting_for_active);