From: Sage Weil <sage@inktank.com>
Date: Fri, 21 Dec 2012 05:45:09 +0000 (-0800)
Subject: osd: only dec_scrubs_active if we were active
X-Git-Tag: v0.56~18^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e765dcb4f1894ae0a87a67e24f6f2ea7e0fcb145;p=ceph.git

osd: only dec_scrubs_active if we were active

This fixes a bug that puts scrubs_active negative.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c5d3a1f9aa51..aab54f862225 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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);