From: Samuel Just <sam.just@inktank.com>
Date: Fri, 1 Jun 2012 16:49:55 +0000 (-0700)
Subject: PG: use osd->requeue_ops for ops, pg->queue_for_peering to requeue pg
X-Git-Tag: v0.50~109^2~2^2~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fff0874c9529fddf6e41e5e363b68d3e3694a5d3;p=ceph.git

PG: use osd->requeue_ops for ops, pg->queue_for_peering to requeue pg

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index eaf4d29a6bc0..58e9093f84d9 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4000,8 +4000,10 @@ void PG::queue_op(OpRequestRef op)
 void PG::take_waiters()
 {
   dout(10) << "take_waiters" << dendl;
-  op_queue.splice(op_queue.begin(), op_waiters,
-		  op_waiters.begin(), op_waiters.end());
+  osd->requeue_ops(this, op_waiters);
+  for (list<CephPeeringEvtRef>::iterator i = peering_waiters.begin();
+       i != peering_waiters.end();
+       ++i) osd->queue_for_peering(this);
   peering_queue.splice(peering_queue.begin(), peering_waiters,
 		       peering_waiters.begin(), peering_waiters.end());
 }