From 82f703606452281fe7942377dac92af90d3013d0 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 14 Nov 2018 23:56:51 -0800 Subject: [PATCH] osd: Prioritize user specified scrubs Fixes: http://tracker.ceph.com/issues/37269 Signed-off-by: David Zafman (cherry picked from commit 5f1a7ef029b0c4b59bc73fd709bdc096970a36ce) --- src/osd/PG.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 66bce23e59640..888957e873968 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3921,8 +3921,11 @@ void PG::reg_next_scrub() utime_t reg_stamp; bool must = false; - if (scrubber.must_scrub || - (info.stats.stats_invalid && cct->_conf->osd_scrub_invalid_stats)) { + if (scrubber.must_scrub) { + // Set the smallest time that isn't utime_t() + reg_stamp = utime_t(0,1); + must = true; + } else if (info.stats.stats_invalid && cct->_conf->osd_scrub_invalid_stats) { reg_stamp = ceph_clock_now(); must = true; } else { -- 2.39.5