From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 21 Apr 2015 03:48:41 +0000 (+0800)
Subject: osd/PG: check scrub state when handle CEPH_OSD_OP_SCRUB_MAP.
X-Git-Tag: v9.0.1~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4222%2Fhead;p=ceph.git

osd/PG: check scrub state when handle CEPH_OSD_OP_SCRUB_MAP.

There is a chance which cause scrub stop before replica-node send
scrub-map.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 03bf405ea031..825c2e7cec9e 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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;