From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Dec 2012 19:17:23 +0000 (-0800)
Subject: PG: in sched_scrub() set PG_STATE_DEEP_SCRUB not scrubber.deep
X-Git-Tag: v0.56~18^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=670afc6c0c7f2bcfd00658c66ccedd8c967bfe96;p=ceph.git

PG: in sched_scrub() set PG_STATE_DEEP_SCRUB not scrubber.deep

scrubber.deep gets reset in scrub() to match
state_test(PG_STATE_DEEP_SCRUB).

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c5566a1bf41..a88887fbcdb 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3013,7 +3013,7 @@ bool PG::sched_scrub()
 
   if (ceph_clock_now(g_ceph_context) > info.history.last_deep_scrub_stamp + g_conf->osd_deep_scrub_interval) {
     dout(10) << "sched_scrub: scrub will be deep" << dendl;
-    scrubber.deep = true;
+    state_set(PG_STATE_DEEP_SCRUB);
   }
 
   bool ret = false;