From f74e3105b1bc9787927dc3fb66fdbf35d34e30e7 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Sun, 22 Nov 2015 10:14:12 -0800 Subject: [PATCH] osd: Only add random deep scrubs when NOT user initiated scrub Signed-off-by: David Zafman --- src/osd/PG.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 571c431739a4..a580c2dc6b27 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); -- 2.47.3