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-14 00:45:33 -0700 |
| commit | 2a38af0c66569ebbfd5da6daf8f5271cb6072769 (patch) | |
| tree | b13685250de81ce8f3022649928912574ad701ab | |
| parent | 39faece3c74593b52faedfe7eb388014b65de562 (diff) | |
| download | ceph-2a38af0c66569ebbfd5da6daf8f5271cb6072769.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 6c923d75754..196ef6912a4 100644 --- a/src/osd/ReplicatedBackend.h +++ b/src/osd/ReplicatedBackend.h @@ -149,7 +149,6 @@ private: struct PushInfo { ObjectRecoveryProgress recovery_progress; ObjectRecoveryInfo recovery_info; - int priority; void dump(Formatter *f) const { { @@ -170,7 +169,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 8b269917648..e9ce3c883c1 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6530,7 +6530,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) |