From: Samuel Just <sam.just@inktank.com>
Date: Mon, 22 Oct 2012 21:25:27 +0000 (-0700)
Subject: ReplicatedPG: actually delay op for backfill_pos
X-Git-Tag: v0.55~130^2~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9608a88b32cdb544c0e740612bff97a74331b63f;p=ceph.git

ReplicatedPG: actually delay op for backfill_pos

3f952afe5da644b30015fead8e3d42a129b59989 neglected to
actually delay the op in ReplicatedPG::do_op.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 0ee19b720ac..5763c43d985 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -651,6 +651,11 @@ void ReplicatedPG::do_op(OpRequestRef op)
     return;
   }
 
+  if (head == backfill_pos) {
+    wait_for_backfill_pos(op);
+    return;
+  }
+
   // missing snapdir?
   hobject_t snapdir(m->get_oid(), m->get_object_locator().key,
 		    CEPH_SNAPDIR, m->get_pg().ps(), info.pgid.pool());