diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-09-01 13:49:53 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-19 20:04:17 -0700 |
| commit | 6d4b86a282ac833e98425d951c86773f2df75cce (patch) | |
| tree | b94a326a839e593ef4d1de5bac84b5bdbb1cf9d4 | |
| parent | 95b4039d6440d152603f615547b08037b2827c62 (diff) | |
| download | ceph-6d4b86a282ac833e98425d951c86773f2df75cce.tar.gz | |
ReplicatedPG/Backend: shuffle do_pull/do_push_reply
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedBackend.h | 4 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 4 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index c4f501360d8..bba797e5ae5 100644 --- 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 726e630b18c..9ff71a572df 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1632,7 +1632,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); @@ -1648,7 +1648,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 93f0ed44fff..05d9845292e 100644 --- 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); |