osd: Prioritize user specified scrubs

Fixes: http://tracker.ceph.com/issues/37269
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 5f1a7ef029b0c4b59bc73fd709bdc096970a36ce)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 66bce23e596404a27c94082e253eb9218faed5c3..888957e8739688d0b375a459b8748a79adf1b561 100644 (file)
--- 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 {