osd: Prioritize user specified scrubs

Fixes: http://tracker.ceph.com/issues/37269

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2018-11-14 23:56:51 -08:00
parent eaf8e40980
commit 5f1a7ef029

View File

@ -4301,8 +4301,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 {