From: Samuel Just <sjust@redhat.com>
Date: Tue, 18 Oct 2016 21:43:36 +0000 (-0700)
Subject: PGBackend: add DoutPrefixProvider to parent interface
X-Git-Tag: v11.1.0~245^2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb3b2024f213f595d3aa3cb4aad6ec53072f8bac;p=ceph.git

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 a1c41864d8a8..f5d95f7733b8 100644
--- 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 b629b53657e6..46c7d7ca66ec 100644
--- 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 36c7bfbee2d1..e02c4668a1a4 100644
--- 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,