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>

diff --git a/src/osd/ReplicatedBackend.h b/src/osd/ReplicatedBackend.h
index c57b10cbf1ce56ba5bb500f52c69d12949ecb7b8..88323935e96913c20a88b9cc901fa9c1d3c6798e 100644 (file)
--- 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 bf514671dcece830ecc5e9c89b9b5ea309dcb2ea..728af35319389534409a5613a82dcb36b9d2ef5e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -6664,7 +6664,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)