]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: kill extra scrubber state transition
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 23 Feb 2018 05:49:43 +0000 (13:49 +0800)
committerDavid Zafman <dzafman@redhat.com>
Fri, 18 May 2018 16:37:57 +0000 (09:37 -0700)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 323dca0c82b710766ece06da8efe8d99cf3c07ab)

src/osd/PG.cc

index f4144cb7fe5ba5f92bcb4afb35c8b76bd9d8384a..78f0303b8d2e6fd3f06b7eabc117926f5880073a 100644 (file)
@@ -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;
 
         {