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 0bd4458f86be4bca8feba283d37b8e0c9eac344e..66bce23e596404a27c94082e253eb9218faed5c3 100644 (file)
--- 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()