From 6c3d4fbeb9cc50eca6eba12cfe7fed64b34eec3d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 13 Mar 2014 14:49:30 -0700 Subject: [PATCH] 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 (cherry picked from commit f2124c5846f1e9cb44e66eb2e957b8c7df3e19f4) Conflicts: src/test/osd/RadosModel.h --- src/test/osd/RadosModel.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 74c90aa797280..26e26ec3409d2 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -524,8 +524,8 @@ public: pair *cb_arg = new pair(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 *cb_arg = new pair(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 *cb_arg = new pair(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(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()); -- 2.39.5