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 eaf4d29a6bc012dd099dee11c5000bff871fe432..58e9093f84d9956465bb8a5c29ecc877189710c2 100644 (file)
--- 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());
 }