From: David Zafman <dzafman@redhat.com>
Date: Sun, 22 Nov 2015 18:14:12 +0000 (-0800)
Subject: osd: Only add random deep scrubs when NOT user initiated scrub
X-Git-Tag: v10.0.1~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f74e3105b1bc9787927dc3fb66fdbf35d34e30e7;p=ceph.git

osd: Only add random deep scrubs when NOT user initiated scrub

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 571c431739a..a580c2dc6b2 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3246,7 +3246,10 @@ bool PG::sched_scrub()
   bool time_for_deep = (ceph_clock_now(cct) >=
     info.history.last_deep_scrub_stamp + cct->_conf->osd_deep_scrub_interval);
 
-  bool deep_coin_flip = (rand() % 100) < cct->_conf->osd_deep_scrub_randomize_ratio * 100;
+  bool deep_coin_flip = false;
+  // Only add random deep scrubs when NOT user initiated scrub
+  if (!scrubber.must_scrub)
+      deep_coin_flip = (rand() % 100) < cct->_conf->osd_deep_scrub_randomize_ratio * 100;
   dout(20) << __func__ << ": time_for_deep=" << time_for_deep << " deep_coin_flip=" << deep_coin_flip << dendl;
 
   time_for_deep = (time_for_deep || deep_coin_flip);