]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop redundant is_active() check before scrub_sched()
authorSage Weil <sage@redhat.com>
Mon, 18 Sep 2017 19:51:36 +0000 (14:51 -0500)
committerSage Weil <sage@redhat.com>
Fri, 6 Oct 2017 18:08:18 +0000 (13:08 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index d59d59221652e219145125b203163d1d4e283b23..207311bae081bf76b45aba3114754f55774f4123 100644 (file)
@@ -6889,15 +6889,13 @@ void OSD::sched_scrub()
       PG *pg = _lookup_lock_pg(scrub.pgid);
       if (!pg)
        continue;
-      if (pg->is_active()) {
-       dout(10) << "sched_scrub scrubbing " << scrub.pgid << " at " << scrub.sched_time
-                << (pg->get_must_scrub() ? ", explicitly requested" :
-                    (load_is_low ? ", load_is_low" : " deadline < now"))
-                << dendl;
-       if (pg->sched_scrub()) {
-         pg->unlock();
-         break;
-       }
+      dout(10) << "sched_scrub scrubbing " << scrub.pgid << " at " << scrub.sched_time
+              << (pg->get_must_scrub() ? ", explicitly requested" :
+                  (load_is_low ? ", load_is_low" : " deadline < now"))
+              << dendl;
+      if (pg->sched_scrub()) {
+       pg->unlock();
+       break;
       }
       pg->unlock();
     } while (service.next_scrub_stamp(scrub, &scrub));