From 14f76cc264290fbf6a22fe3123889617fa2c2489 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 7 Dec 2013 14:22:09 -0800 Subject: [PATCH] ceph_test_rados: fix CopyFromOp locking Signed-off-by: Sage Weil --- src/test/osd/RadosModel.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index e1114d4cd65e4..0c58827cd4473 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -1438,17 +1438,17 @@ public: context->oid_not_in_use.erase(oid); context->oid_in_use.insert(oid_src); context->oid_not_in_use.erase(oid_src); - } - // choose source snap - if (0 && !(rand() % 4) && !context->snaps.empty()) { - snap = rand_choose(context->snaps)->first; - } else { - snap = -1; + // choose source snap + if (0 && !(rand() % 4) && !context->snaps.empty()) { + snap = rand_choose(context->snaps)->first; + } else { + snap = -1; + } + context->find_object(oid_src, &src_value, snap); + if (!src_value.deleted()) + context->update_object_full(oid, src_value); } - context->find_object(oid_src, &src_value, snap); - if (!src_value.deleted()) - context->update_object_full(oid, src_value); string src = context->prefix+oid_src; op.copy_from(src.c_str(), context->io_ctx, src_value.version); -- 2.39.5