]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 24 Oct 2017 14:07:18 +0000 (22:07 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 24 Oct 2017 14:07:18 +0000 (22:07 +0800)
Avoid every time call scrubber.write_block_by_scrub. Most time scrubber
is inactive. And compare to write_block_by_scrub, is_chunky_scrub_active
is light.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/PrimaryLogPG.cc

index 731f135fbb787d62c1c14756e43cc38a211b0f67..ca77a1343329aac6152e66e4b52bfd94a1bff3af 100644 (file)
@@ -2026,7 +2026,7 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
     return;
   }
 
-  if (write_ordered &&
+  if (write_ordered && scrubber.is_chunky_scrub_active() &&
       scrubber.write_blocked_by_scrub(head)) {
     dout(20) << __func__ << ": waiting for scrub" << dendl;
     waiting_for_scrub.push_back(op);