From: David Zafman <dzafman@redhat.com>
Date: Thu, 15 Nov 2018 07:56:51 +0000 (-0800)
Subject: osd: Prioritize user specified scrubs
X-Git-Tag: v12.2.11~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25514%2Fhead;p=ceph.git

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 66bce23e5964..888957e87396 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 {