From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 23 Feb 2018 05:49:43 +0000 (+0800)
Subject: osd/PG: kill extra scrubber state transition
X-Git-Tag: v12.2.6~98^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a33e939af44a37af17290d97daf947ef3d50f4a7;p=ceph.git

osd/PG: kill extra scrubber state transition

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 323dca0c82b710766ece06da8efe8d99cf3c07ab)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f4144cb7fe5b..78f0303b8d2e 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4638,9 +4638,8 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
 	  scrubber.preempt_divisor *= 2;
 	  dout(10) << __func__ << " preempted, " << scrubber.preempt_left
 		   << " left" << dendl;
-	  scrubber.state = PG::Scrubber::NEW_CHUNK;
+	  scrub_preempted = false;
 	}
-	scrub_preempted = false;
 	scrub_can_preempt = scrubber.preempt_left > 0;
 
         {