ceph_test_rados: wait for commit, not ack

First, this is what we wanted in the first place

Second, if we wait for ACK, we may look at a user_version value that is
not stable.

Fixes: #7705
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit f2124c5846f1e9cb44e66eb2e957b8c7df3e19f4)

Conflicts:

	src/test/osd/RadosModel.h

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 74c90aa797280229bb8f09edf443480b734fba38..26e26ec3409d2b069757937559ee49cf9637511c 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -524,8 +524,8 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback,
-                                               NULL);
+    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+                                               &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
   }
 
@@ -611,8 +611,8 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback,
-                                               NULL);
+    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+                                               &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
   }
 
@@ -701,8 +701,8 @@ public:
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                               new TestOp::CallbackInfo(0));
-    comp = context->rados.aio_create_completion((void*) cb_arg, &write_callback,
-                                               NULL);
+    comp = context->rados.aio_create_completion((void*) cb_arg, NULL,
+                                               &write_callback);
     context->io_ctx.aio_operate(context->prefix+oid, comp, &op);
   }
 
@@ -801,7 +801,8 @@ public:
        new pair<TestOp*, TestOp::CallbackInfo*>(this,
                                                 new TestOp::CallbackInfo(tid));
       librados::AioCompletion *completion =
-       context->rados.aio_create_completion((void*) cb_arg, &write_callback, NULL);
+       context->rados.aio_create_completion((void*) cb_arg, NULL,
+                                            &write_callback);
       waiting.insert(completion);
       context->io_ctx.aio_write(context->prefix+oid, completion,
                                to_write, i.get_len(), i.get_start());