From: kungf <yang.wang@easystack.cn>
Date: Thu, 21 Sep 2017 10:55:45 +0000 (+0800)
Subject: osd: make scrub right now when pg stats_invalid is true
X-Git-Tag: v12.2.11~91^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a375e1144d6107d723f9f239618634b3493dd98;p=ceph.git

osd: make scrub right now when pg stats_invalid is true

Signed-off-by: kungf <yang.wang@easystack.cn>
(cherry picked from commit a2ac3078ccc28656861718a248a3f4199fc17434)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 0bd4458f86be..66bce23e5964 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3920,9 +3920,11 @@ void PG::reg_next_scrub()
     return;
 
   utime_t reg_stamp;
+  bool must = false;
   if (scrubber.must_scrub ||
       (info.stats.stats_invalid && cct->_conf->osd_scrub_invalid_stats)) {
     reg_stamp = ceph_clock_now();
+    must = true;
   } else {
     reg_stamp = info.history.last_scrub_stamp;
   }
@@ -3936,7 +3938,7 @@ void PG::reg_next_scrub()
 					       reg_stamp,
 					       scrub_min_interval,
 					       scrub_max_interval,
-					       scrubber.must_scrub);
+					       must);
 }
 
 void PG::unreg_next_scrub()