From: Sage Weil <sage@redhat.com>
Date: Mon, 18 Sep 2017 19:51:36 +0000 (-0500)
Subject: osd: drop redundant is_active() check before scrub_sched()
X-Git-Tag: v13.0.1~634^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6d3077225cef1c0b0847ebb040966d01ac8bc2e;p=ceph.git

osd: drop redundant is_active() check before scrub_sched()

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d59d59221652..207311bae081 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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));