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

osd/PGBackend: remove scrub_supported()

Everybody supports scrub.

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

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index a51ce01a1a4..35655e16d9f 100644
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -667,7 +667,6 @@ public:
     uint64_t old_size,
     ObjectStore::Transaction *t) override;
 
-  bool scrub_supported() override { return true; }
   bool auto_repair_supported() const override { return true; }
 
   void be_deep_scrub(
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a3d4f992110..9d59e495399 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6889,7 +6889,7 @@ void OSD::sched_scrub()
       PG *pg = _lookup_lock_pg(scrub.pgid);
       if (!pg)
 	continue;
-      if (pg->get_pgbackend()->scrub_supported() && pg->is_active()) {
+      if (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"))
diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index f957f0f4a5f..b9604dd2729 100644
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -552,7 +552,6 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
 		pair<bufferlist*, Context*> > > &to_read,
      Context *on_complete, bool fast_read = false) = 0;
 
-   virtual bool scrub_supported() = 0;
    virtual bool auto_repair_supported() const = 0;
    void be_scan_list(
      ScrubMap &map, const vector<hobject_t> &ls, bool deep, uint32_t seed,
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index 7635bd5f054..3891e0fe2a3 100644
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -426,7 +426,6 @@ private:
 
   void repop_applied(RepModifyRef rm);
   void repop_commit(RepModifyRef rm);
-  bool scrub_supported() override { return true; }
   bool auto_repair_supported() const override { return false; }