From: Samuel Just <sam.just@inktank.com>
Date: Mon, 9 Sep 2013 20:20:06 +0000 (-0700)
Subject: ReplicatedBackend: remove priority from Pull/PushInfo
X-Git-Tag: v0.71~68^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7a0b23418a3f63f8994e2d34cd875c68343d6e5;p=ceph.git

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 c57b10cbf1ce..88323935e969 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 bf514671dcec..728af3531938 100644
--- 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)