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 a51ce01a1a450888e54856e7f36c62fc32d808f5..35655e16d9fe7fdc8b39c52ddd20d99a15e8028d 100644 (file)
--- 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 a3d4f99211051216cf5d9af6d3653888ebc84e3e..9d59e495399be7512211e4eeec11f42f1be52425 100644 (file)
--- 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 f957f0f4a5f65c7737ed6565af032eb472595350..b9604dd2729c19f25fdc8a260f669c0efb013875 100644 (file)
--- 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 7635bd5f0548a4a4201354be1f5ba457b12af9c7..3891e0fe2a34190168c5ac08e1070de525c65ae5 100644 (file)
--- 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; }