]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: check scrub state when handle CEPH_OSD_OP_SCRUB_MAP. 4222/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 21 Apr 2015 03:48:41 +0000 (11:48 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 21 Apr 2015 03:48:41 +0000 (11:48 +0800)
There is a chance which cause scrub stop before replica-node send
scrub-map.

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

index 03bf405ea03121a4adb4d5a800744515a6b93dc4..825c2e7cec9e34406101f4de949078db9600a4e3 100644 (file)
@@ -3322,6 +3322,11 @@ void PG::sub_op_scrub_map(OpRequestRef op)
     return;
   }
 
+  if (!scrubber.is_chunky_scrub_active()) {
+    dout(10) << "sub_op_scrub_map scrub isn't active" << dendl;
+    return;
+  }
+
   op->mark_started();
 
   dout(10) << " got " << m->from << " scrub map" << dendl;