PGBackend: add DoutPrefixProvider to parent interface

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index a1c41864d8a8581dd96dbd93abde817c9893aeee..f5d95f7733b8e20dfdf54946becf39a5ef5ad693 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -192,7 +192,7 @@ struct PGPool {
  *
  */
 
-class PG : DoutPrefixProvider {
+class PG : protected DoutPrefixProvider {
 protected:
   OSDService *osd;
   CephContext *cct;

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index b629b53657e6902f599206a8cbaab83dec73c3f2..46c7d7ca66ec0db01df3f6f5c71a89de4616c794 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -63,6 +63,9 @@ typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
     */
    class Listener {
    public:
+     /// Debugging
+     virtual DoutPrefixProvider *get_dpp() = 0;
+
      /// Recovery
 
      /**

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 36c7bfbee2d10a570789074e5d7c41a0a415583e..e02c4668a1a4cd9d1b4d394da9206d92d4e1587a 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -240,6 +240,10 @@ public:
   }
 
   /// Listener methods
+  DoutPrefixProvider *get_dpp() override {
+    return this;
+  }
+
   void on_local_recover(
     const hobject_t &oid,
     const ObjectRecoveryInfo &recovery_info,