Merge pull request ceph#18982 from neha-ojha/wip-const-cleanup

osd/PG: const cleanup for recoverable/readable predicates Reviewed-by: Sage Weil <[email protected]>
xiaoxichen · Nov 20, 2017 · 028ab3b · 028ab3b
2 parents 697fb15 + c8419de
commit 028ab3b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
@@ -602,7 +602,7 @@ class ECBackend : public PGBackend {
       return ec_impl->minimum_to_decode(want, have, &min) == 0;
     }
   };
-  IsPGRecoverablePredicate *get_is_recoverable_predicate() override {
+  IsPGRecoverablePredicate *get_is_recoverable_predicate() const override {
     return new ECRecPred(ec_impl);
   }
 
@@ -622,7 +622,7 @@ class ECBackend : public PGBackend {
       return _have.count(whoami) && rec_pred(_have);
     }
   };
-  IsPGReadablePredicate *get_is_readable_predicate() override {
+  IsPGReadablePredicate *get_is_readable_predicate() const override {
     return new ECReadPred(get_parent()->whoami_shard(), ec_impl);
   }
 

diff --git a/src/osd/PG.h b/src/osd/PG.h
@@ -572,11 +572,12 @@ class PG : public DoutPrefixProvider {
   bool eio_errors_to_process = false;
 
   virtual PGBackend *get_pgbackend() = 0;
+  virtual const PGBackend* get_pgbackend() const = 0;
 
 protected:
   /*** PG ****/
   /// get_is_recoverable_predicate: caller owns returned pointer and must delete when done
-  IsPGRecoverablePredicate *get_is_recoverable_predicate() {
+  IsPGRecoverablePredicate *get_is_recoverable_predicate() const {
     return get_pgbackend()->get_is_recoverable_predicate();
   }
 protected:

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
@@ -399,8 +399,8 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
 
    virtual void on_flushed() = 0;
 
-   virtual IsPGRecoverablePredicate *get_is_recoverable_predicate() = 0;
-   virtual IsPGReadablePredicate *get_is_readable_predicate() = 0;
+   virtual IsPGRecoverablePredicate *get_is_recoverable_predicate() const = 0;
+   virtual IsPGReadablePredicate *get_is_readable_predicate() const = 0;
 
    virtual void dump_recovery_info(Formatter *f) const = 0;
 

diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
@@ -245,6 +245,10 @@ class PrimaryLogPG : public PG, public PGBackend::Listener {
     return pgbackend.get();
   }
 
+  const PGBackend *get_pgbackend() const override {
+    return pgbackend.get();
+  }
+
   /// Listener methods
   DoutPrefixProvider *get_dpp() override {
     return this;

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
@@ -75,7 +75,7 @@ class ReplicatedBackend : public PGBackend {
       return !have.empty();
     }
   };
-  IsPGRecoverablePredicate *get_is_recoverable_predicate() override {
+  IsPGRecoverablePredicate *get_is_recoverable_predicate() const override {
     return new RPCRecPred;
   }
 
@@ -87,7 +87,7 @@ class ReplicatedBackend : public PGBackend {
       return have.count(whoami);
     }
   };
-  IsPGReadablePredicate *get_is_readable_predicate() override {
+  IsPGReadablePredicate *get_is_readable_predicate() const override {
     return new RPCReadPred(get_parent()->whoami_shard());
   }