]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: make scrub right now when pg stats_invalid is true
authorkungf <yang.wang@easystack.cn>
Thu, 21 Sep 2017 10:55:45 +0000 (18:55 +0800)
committerkungf <yang.wang@easystack.cn>
Thu, 21 Sep 2017 11:40:10 +0000 (19:40 +0800)
Signed-off-by: kungf <yang.wang@easystack.cn>
src/osd/PG.cc

index dc7a280d28e8767ed67d1d75406dd3b5d8101856..e01a1f06992a7a730a07b252829a17c60d8d905c 100644 (file)
@@ -3568,9 +3568,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;
   }
@@ -3584,7 +3586,7 @@ void PG::reg_next_scrub()
                                               reg_stamp,
                                               scrub_min_interval,
                                               scrub_max_interval,
-                                              scrubber.must_scrub);
+                                              must);
 }
 
 void PG::unreg_next_scrub()