osd/OSD.cc: lock the pg only when all conditional checks are passed when

scheduling a  scrub

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b196f1fba9e0c6d7a5eadc49c6d9c79069111e2d..95645e805798b2c14288b91f2154a956a54d53cd 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6833,11 +6833,16 @@ void OSD::sched_scrub()
         break;
       }
 
+      if ((scrub.deadline >= now) && !(time_permit && load_is_low)) {
+        dout(10) << __func__ << " not scheduling scrub for " << scrub.pgid << " due to "
+                 << (!time_permit ? "time not permit" : "high load") << dendl;
+        continue;
+      }
+
       PG *pg = _lookup_lock_pg(scrub.pgid);
       if (!pg)
        continue;
-      if (pg->get_pgbackend()->scrub_supported() && pg->is_active() &&
-         (scrub.deadline < now || (time_permit && load_is_low))) {
+      if (pg->get_pgbackend()->scrub_supported() && pg->is_active()) {
        dout(10) << "sched_scrub scrubbing " << scrub.pgid << " at " << scrub.sched_time
                 << (pg->scrubber.must_scrub ? ", explicitly requested" :
                     (load_is_low ? ", load_is_low" : " deadline < now"))