ReplicatedPG/Backend: shuffle do_pull/do_push_reply

Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index c4f501360d8d70a8b364ace14407ba19d21a95ca..bba797e5ae5e0b09b4576bcee80a839d346b59ac 100644 (file)
--- a/src/osd/ReplicatedBackend.h
+++ b/src/osd/ReplicatedBackend.h
@@ -213,8 +213,8 @@ private:
       _do_push(op);
     }
   }
-  void do_pull(OpRequestRef op) {}
-  void do_push_reply(OpRequestRef op) {}
+  void do_pull(OpRequestRef op);
+  void do_push_reply(OpRequestRef op);
 
   bool handle_push_reply(int peer, PushReplyOp &op, PushOp *reply) { return true; }
   void handle_pull(int peer, PullOp &op, PushOp *reply) {}

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 32a3878242c6197326909a83a39ed2caf025617a..5560813af8e6bd943662752f89539756081e906f 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1633,7 +1633,7 @@ void ReplicatedBackend::_do_pull_response(OpRequestRef op)
   get_parent()->queue_transaction(t);
 }
 
-void ReplicatedPG::do_pull(OpRequestRef op)
+void ReplicatedBackend::do_pull(OpRequestRef op)
 {
   MOSDPGPull *m = static_cast<MOSDPGPull *>(op->request);
   assert(m->get_header().type == MSG_OSD_PG_PULL);
@@ -1649,7 +1649,7 @@ void ReplicatedPG::do_pull(OpRequestRef op)
   send_pushes(m->get_priority(), replies);
 }
 
-void ReplicatedPG::do_push_reply(OpRequestRef op)
+void ReplicatedBackend::do_push_reply(OpRequestRef op)
 {
   MOSDPGPushReply *m = static_cast<MOSDPGPushReply *>(op->request);
   assert(m->get_header().type == MSG_OSD_PG_PUSH_REPLY);

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 8562150fdaa9293502ea1a594900f58af380cda1..cc3f9f571345359078b426f06830f14aa5121f7d 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -906,8 +906,6 @@ public:
     ThreadPool::TPHandle &handle);
   void do_backfill(OpRequestRef op);
 
-  void do_pull(OpRequestRef op);
-  void do_push_reply(OpRequestRef op);
   RepGather *trim_object(const hobject_t &coid);
   void snap_trimmer();
   int do_osd_ops(OpContext *ctx, vector<OSDOp>& ops);