From: Samuel Just <sjust@redhat.com>
Date: Thu, 21 May 2015 19:13:43 +0000 (-0700)
Subject: RadosModel: randomly prefix delete with assert_exists
X-Git-Tag: v9.0.2~90^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fe7d2abdff2fce359e5e992206644cc03825ee0;p=ceph.git

RadosModel: randomly prefix delete with assert_exists

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 9192c5dd19d..8d6889edb4c 100644
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -944,7 +944,15 @@ public:
     interval_set<uint64_t> ranges;
     context->state_lock.Unlock();
 
-    int r = context->io_ctx.remove(context->prefix+oid);
+    int r = 0;
+    if (rand() % 2) {
+      librados::ObjectWriteOperation op;
+      op.assert_exists();
+      op.remove();
+      r = context->io_ctx.operate(context->prefix+oid, &op);
+    } else {
+      r = context->io_ctx.remove(context->prefix+oid);
+    }
     if (r && !(r == -ENOENT && !present)) {
       cerr << "r is " << r << " while deleting " << oid << " and present is " << present << std::endl;
       assert(0);