diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-09-09 13:20:06 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-09-19 12:50:46 -0700 |
| commit | 342788f5beaa1a5bbb337ec547431ea28cf884c4 (patch) | |
| tree | a5721fa536f5e0778eeb3dbecb1bedf915fd73a6 | |
| parent | 6d858503d92afef038ed099b6965e431e26eacfb (diff) | |
| download | ceph-342788f5beaa1a5bbb337ec547431ea28cf884c4.tar.gz | |
ReplicatedBackend: remove priority from Pull/PushInfo
Instead, we'll just nab the priority from the messages.
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedBackend.h | 2 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h index c57b10cbf1c..88323935e96 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -148,7 +148,6 @@ private: struct PushInfo { ObjectRecoveryProgress recovery_progress; ObjectRecoveryInfo recovery_info; - int priority; void dump(Formatter *f) const { { @@ -169,7 +168,6 @@ private: struct PullInfo { ObjectRecoveryProgress recovery_progress; ObjectRecoveryInfo recovery_info; - int priority; void dump(Formatter *f) const { { diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index cdb8796baaa..cc39a32e9e7 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6651,7 +6651,7 @@ void ReplicatedBackend::sub_op_push_reply(OpRequestRef op) PushOp pop; bool more = handle_push_reply(peer, rop, &pop); if (more) - send_push_op_legacy(pushing[soid][peer].priority, peer, pop); + send_push_op_legacy(op->request->get_priority(), peer, pop); } bool ReplicatedBackend::handle_push_reply(int peer, PushReplyOp &op, PushOp *reply) |