]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: kill extra scrubber state transition 20552/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 23 Feb 2018 05:49:43 +0000 (13:49 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 23 Feb 2018 06:26:47 +0000 (14:26 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PG.cc

index b3abd76d31b681a5ab6414f199a25427f40f5231..7a84647a1759ba2178fe42e46f584824d48876db 100644 (file)
@@ -4622,9 +4622,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;
 
         {