From: Sage Weil <sage@redhat.com>
Date: Mon, 18 Sep 2017 19:01:00 +0000 (-0500)
Subject: osd/PG: get_must_scrub()
X-Git-Tag: v13.0.1~634^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88c13308b6a2596847562fd8bb3bc410bb8018a2;p=ceph-ci.git

osd/PG: get_must_scrub()

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 9d59e495399..7d941eeff3f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6891,7 +6891,7 @@ void OSD::sched_scrub()
 	continue;
       if (pg->is_active()) {
 	dout(10) << "sched_scrub scrubbing " << scrub.pgid << " at " << scrub.sched_time
-		 << (pg->scrubber.must_scrub ? ", explicitly requested" :
+		 << (pg->get_must_scrub() ? ", explicitly requested" :
 		     (load_is_low ? ", load_is_low" : " deadline < now"))
 		 << dendl;
 	if (pg->sched_scrub()) {
diff --git a/src/osd/PG.h b/src/osd/PG.h
index fb69a6280a4..65fb5afd73f 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -463,6 +463,10 @@ public:
 
   virtual void shutdown() = 0;
 
+  bool get_must_scrub() const {
+    return scrubber.must_scrub;
+  }
+
   virtual void do_request(
     OpRequestRef& op,
     ThreadPool::TPHandle &handle