]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: actually delay op for backfill_pos
authorSamuel Just <sam.just@inktank.com>
Mon, 22 Oct 2012 21:25:27 +0000 (14:25 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 30 Oct 2012 20:31:10 +0000 (13:31 -0700)
3f952afe5da644b30015fead8e3d42a129b59989 neglected to
actually delay the op in ReplicatedPG::do_op.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 0ee19b720ac34fe11a6e2ade07e157bb48b17fa1..5763c43d9857756188488177104d63dc4dd50588 100644 (file)
@@ -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());