librbd: rbd ack cleanup

src/librbd/AsyncRequest.cc

@@ -27,7 +27,7 @@ void AsyncRequest<T>::async_complete(int r) {
 
 template <typename T>
 librados::AioCompletion *AsyncRequest<T>::create_callback_completion() {
-  return util::create_rados_safe_callback(this);
+  return util::create_rados_callback(this);
 }
 
 template <typename T>

src/librbd/DiffIterate.cc

@@ -61,7 +61,7 @@ class C_DiffObject : public Context {
   void send() {
     C_OrderedThrottle *ctx = m_diff_context.throttle.start_op(this);
     librados::AioCompletion *rados_completion =
-      util::create_rados_safe_callback(ctx);
+      util::create_rados_callback(ctx);
 
     librados::ObjectReadOperation op;
     op.list_snaps(&m_snap_set, &m_snap_ret);

src/librbd/ImageWatcher.cc

@@ -27,7 +27,7 @@ using namespace image_watcher;
 using namespace watch_notify;
 using util::create_async_context_callback;
 using util::create_context_callback;
-using util::create_rados_safe_callback;
+using util::create_rados_callback;
 using librbd::watcher::HandlePayloadVisitor;
 using librbd::watcher::C_NotifyAck;
 

src/librbd/LibrbdWriteback.cc

@@ -216,7 +216,7 @@ namespace librbd {
     int flags = m_ictx->get_read_flags(snapid);
 
     librados::AioCompletion *rados_completion =
-      util::create_rados_ack_callback(req);
+      util::create_rados_callback(req);
     int r = m_ictx->data_ctx.aio_operate(oid.name, rados_completion, &op,
 					 flags, NULL);
     rados_completion->release();

src/librbd/MirroringWatcher.cc

@@ -46,7 +46,7 @@ void MirroringWatcher<I>::notify_mode_updated(librados::IoCtx &io_ctx,
   bufferlist bl;
   ::encode(NotifyMessage{ModeUpdatedPayload{mirror_mode}}, bl);
 
-  librados::AioCompletion *comp = util::create_rados_ack_callback(on_finish);
+  librados::AioCompletion *comp = util::create_rados_callback(on_finish);
   int r = io_ctx.aio_notify(RBD_MIRRORING, comp, bl, NOTIFY_TIMEOUT_MS,
                             nullptr);
   assert(r == 0);
@@ -76,7 +76,7 @@ void MirroringWatcher<I>::notify_image_updated(
   ::encode(NotifyMessage{ImageUpdatedPayload{
       mirror_image_state, image_id, global_image_id}}, bl);
 
-  librados::AioCompletion *comp = util::create_rados_ack_callback(on_finish);
+  librados::AioCompletion *comp = util::create_rados_callback(on_finish);
   int r = io_ctx.aio_notify(RBD_MIRRORING, comp, bl, NOTIFY_TIMEOUT_MS,
                             nullptr);
   assert(r == 0);

src/librbd/ObjectMap.cc

@@ -185,7 +185,7 @@ void ObjectMap<I>::aio_save(Context *on_finish) {
   cls_client::object_map_save(&op, m_object_map);
 
   std::string oid(object_map_name(m_image_ctx.id, m_snap_id));
-  librados::AioCompletion *comp = util::create_rados_safe_callback(on_finish);
+  librados::AioCompletion *comp = util::create_rados_callback(on_finish);
 
   int r = m_image_ctx.md_ctx.aio_operate(oid, comp, &op);
   assert(r == 0);

src/librbd/Utils.cc

@@ -41,8 +41,8 @@ std::string unique_lock_name(const std::string &name, void *address) {
   return name + " (" + stringify(address) + ")";
 }
 
-librados::AioCompletion *create_rados_ack_callback(Context *on_finish) {
-  return create_rados_ack_callback<Context, &Context::complete>(on_finish);
+librados::AioCompletion *create_rados_callback(Context *on_finish) {
+  return create_rados_callback<Context, &Context::complete>(on_finish);
 }
 
 std::string generate_image_id(librados::IoCtx &ioctx) {

src/librbd/Utils.h

@@ -100,44 +100,26 @@ const std::string header_name(const std::string &image_id);
 const std::string old_header_name(const std::string &image_name);
 std::string unique_lock_name(const std::string &name, void *address);
 
-librados::AioCompletion *create_rados_ack_callback(Context *on_finish);
+librados::AioCompletion *create_rados_callback(Context *on_finish);
 
 template <typename T>
-librados::AioCompletion *create_rados_ack_callback(T *obj) {
+librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
     obj, &detail::rados_callback<T>, nullptr);
 }
 
 template <typename T, void(T::*MF)(int)>
-librados::AioCompletion *create_rados_ack_callback(T *obj) {
+librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
     obj, &detail::rados_callback<T, MF>, nullptr);
 }
 
 template <typename T, Context*(T::*MF)(int*), bool destroy=true>
-librados::AioCompletion *create_rados_ack_callback(T *obj) {
+librados::AioCompletion *create_rados_callback(T *obj) {
   return librados::Rados::aio_create_completion(
     obj, &detail::rados_state_callback<T, MF, destroy>, nullptr);
 }
 
-template <typename T>
-librados::AioCompletion *create_rados_safe_callback(T *obj) {
-  return librados::Rados::aio_create_completion(
-    obj, nullptr, &detail::rados_callback<T>);
-}
-
-template <typename T, void(T::*MF)(int)>
-librados::AioCompletion *create_rados_safe_callback(T *obj) {
-  return librados::Rados::aio_create_completion(
-    obj, nullptr, &detail::rados_callback<T, MF>);
-}
-
-template <typename T, Context*(T::*MF)(int*), bool destroy=true>
-librados::AioCompletion *create_rados_safe_callback(T *obj) {
-  return librados::Rados::aio_create_completion(
-    obj, nullptr, &detail::rados_state_callback<T, MF, destroy>);
-}
-
 template <typename T, void(T::*MF)(int) = &T::complete>
 Context *create_context_callback(T *obj) {
   return new detail::C_CallbackAdapter<T, MF>(obj);

src/librbd/Watcher.cc

@@ -20,7 +20,7 @@ namespace librbd {
 using namespace watcher;
 
 using util::create_context_callback;
-using util::create_rados_safe_callback;
+using util::create_rados_callback;
 using std::string;
 
 namespace {
@@ -43,7 +43,7 @@ struct C_UnwatchAndFlush : public Context {
     if (!flushing) {
       flushing = true;
 
-      librados::AioCompletion *aio_comp = create_rados_safe_callback(this);
+      librados::AioCompletion *aio_comp = create_rados_callback(this);
       r = rados.aio_watch_flush(aio_comp);
       assert(r == 0);
       aio_comp->release();
@@ -87,7 +87,7 @@ void Watcher::register_watch(Context *on_finish) {
   assert(m_watch_state == WATCH_STATE_UNREGISTERED);
   m_watch_state = WATCH_STATE_REGISTERING;
 
-  librados::AioCompletion *aio_comp = create_rados_safe_callback(
+  librados::AioCompletion *aio_comp = create_rados_callback(
                                          new C_RegisterWatch(this, on_finish));
   int r = m_ioctx.aio_watch(m_oid, aio_comp, &m_watch_handle, &m_watch_ctx);
   assert(r == 0);
@@ -141,7 +141,7 @@ void Watcher::unregister_watch(Context *on_finish) {
         m_watch_state == WATCH_STATE_ERROR) {
       m_watch_state = WATCH_STATE_UNREGISTERED;
 
-      librados::AioCompletion *aio_comp = create_rados_safe_callback(
+      librados::AioCompletion *aio_comp = create_rados_callback(
                         new C_UnwatchAndFlush(m_ioctx, on_finish));
       int r = m_ioctx.aio_unwatch(m_watch_handle, aio_comp);
       assert(r == 0);

src/librbd/exclusive_lock/PostAcquireRequest.cc

@@ -28,9 +28,7 @@ namespace exclusive_lock {
 
 using util::create_async_context_callback;
 using util::create_context_callback;
-using util::create_rados_ack_callback;
-using util::create_rados_safe_callback;
-
+using util::create_rados_callback;
 
 template <typename I>
 PostAcquireRequest<I>* PostAcquireRequest<I>::create(I &image_ctx,

src/librbd/exclusive_lock/PreAcquireRequest.cc

@@ -19,9 +19,7 @@ namespace exclusive_lock {
 
 using util::create_async_context_callback;
 using util::create_context_callback;
-using util::create_rados_ack_callback;
-using util::create_rados_safe_callback;
-
+using util::create_rados_callback;
 
 template <typename I>
 PreAcquireRequest<I>* PreAcquireRequest<I>::create(I &image_ctx,

src/librbd/image/CreateRequest.cc

@@ -23,7 +23,7 @@
 namespace librbd {
 namespace image {
 
-using util::create_rados_ack_callback;
+using util::create_rados_callback;
 using util::create_context_callback;
 
 namespace {
@@ -276,7 +276,7 @@ void CreateRequest<I>::validate_pool() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_validate_pool>(this);
+    create_rados_callback<klass, &klass::handle_validate_pool>(this);
 
   librados::ObjectReadOperation op;
   op.stat(NULL, NULL, NULL);
@@ -340,7 +340,7 @@ void CreateRequest<I>::create_id_object() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_create_id_object>(this);
+    create_rados_callback<klass, &klass::handle_create_id_object>(this);
   int r = m_ioctx.aio_operate(m_id_obj, comp, &op);
   assert(r == 0);
   comp->release();
@@ -368,7 +368,7 @@ void CreateRequest<I>::add_image_to_directory() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_add_image_to_directory>(this);
+    create_rados_callback<klass, &klass::handle_add_image_to_directory>(this);
   int r = m_ioctx.aio_operate(RBD_DIRECTORY, comp, &op);
   assert(r == 0);
   comp->release();
@@ -404,7 +404,7 @@ void CreateRequest<I>::negotiate_features() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_negotiate_features>(this);
+    create_rados_callback<klass, &klass::handle_negotiate_features>(this);
   int r = m_ioctx.aio_operate(RBD_DIRECTORY, comp, &op, &m_outbl);
   assert(r == 0);
   comp->release();
@@ -456,7 +456,7 @@ void CreateRequest<I>::create_image() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_create_image>(this);
+    create_rados_callback<klass, &klass::handle_create_image>(this);
   int r = m_ioctx.aio_operate(m_header_obj, comp, &op);
   assert(r == 0);
   comp->release();
@@ -492,7 +492,7 @@ void CreateRequest<I>::set_stripe_unit_count() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_set_stripe_unit_count>(this);
+    create_rados_callback<klass, &klass::handle_set_stripe_unit_count>(this);
   int r = m_ioctx.aio_operate(m_header_obj, comp, &op);
   assert(r == 0);
   comp->release();
@@ -528,7 +528,7 @@ void CreateRequest<I>::object_map_resize() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_object_map_resize>(this);
+    create_rados_callback<klass, &klass::handle_object_map_resize>(this);
   int r = m_ioctx.aio_operate(m_objmap_name, comp, &op);
   assert(r == 0);
   comp->release();
@@ -564,7 +564,7 @@ void CreateRequest<I>::fetch_mirror_mode() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_fetch_mirror_mode>(this);
+    create_rados_callback<klass, &klass::handle_fetch_mirror_mode>(this);
   m_outbl.clear();
   int r = m_ioctx.aio_operate(RBD_MIRRORING, comp, &op, &m_outbl);
   assert(r == 0);
@@ -738,7 +738,7 @@ void CreateRequest<I>::remove_object_map() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_remove_object_map>(this);
+    create_rados_callback<klass, &klass::handle_remove_object_map>(this);
   int r = m_ioctx.aio_remove(m_objmap_name, comp);
   assert(r == 0);
   comp->release();
@@ -763,7 +763,7 @@ void CreateRequest<I>::remove_header_object() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_remove_header_object>(this);
+    create_rados_callback<klass, &klass::handle_remove_header_object>(this);
   int r = m_ioctx.aio_remove(m_header_obj, comp);
   assert(r == 0);
   comp->release();
@@ -791,7 +791,7 @@ void CreateRequest<I>::remove_from_dir() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_remove_from_dir>(this);
+    create_rados_callback<klass, &klass::handle_remove_from_dir>(this);
   int r = m_ioctx.aio_operate(RBD_DIRECTORY, comp, &op);
   assert(r == 0);
   comp->release();
@@ -816,7 +816,7 @@ void CreateRequest<I>::remove_id_object() {
 
   using klass = CreateRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_remove_id_object>(this);
+    create_rados_callback<klass, &klass::handle_remove_id_object>(this);
   int r = m_ioctx.aio_remove(m_id_obj, comp);
   assert(r == 0);
   comp->release();

src/librbd/image/OpenRequest.cc

@@ -27,7 +27,7 @@ static uint64_t MAX_METADATA_ITEMS = 128;
 }
 
 using util::create_context_callback;
-using util::create_rados_ack_callback;
+using util::create_rados_callback;
 
 template <typename I>
 OpenRequest<I>::OpenRequest(I *image_ctx, bool skip_open_parent,
@@ -49,7 +49,7 @@ void OpenRequest<I>::send_v1_detect_header() {
 
   using klass = OpenRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_v1_detect_header>(this);
+    create_rados_callback<klass, &klass::handle_v1_detect_header>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(util::old_header_name(m_image_ctx->name),
                                  comp, &op, &m_out_bl);
@@ -91,7 +91,7 @@ void OpenRequest<I>::send_v2_detect_header() {
 
     using klass = OpenRequest<I>;
     librados::AioCompletion *comp =
-      create_rados_ack_callback<klass, &klass::handle_v2_detect_header>(this);
+      create_rados_callback<klass, &klass::handle_v2_detect_header>(this);
     m_out_bl.clear();
     m_image_ctx->md_ctx.aio_operate(util::id_obj_name(m_image_ctx->name),
                                    comp, &op, &m_out_bl);
@@ -130,7 +130,7 @@ void OpenRequest<I>::send_v2_get_id() {
 
     using klass = OpenRequest<I>;
     librados::AioCompletion *comp =
-      create_rados_ack_callback<klass, &klass::handle_v2_get_id>(this);
+      create_rados_callback<klass, &klass::handle_v2_get_id>(this);
     m_out_bl.clear();
     m_image_ctx->md_ctx.aio_operate(util::id_obj_name(m_image_ctx->name),
                                     comp, &op, &m_out_bl);
@@ -168,7 +168,7 @@ void OpenRequest<I>::send_v2_get_name() {
   cls_client::dir_get_name_start(&op, m_image_ctx->id);
 
   using klass = OpenRequest<I>;
-  librados::AioCompletion *comp = create_rados_ack_callback<
+  librados::AioCompletion *comp = create_rados_callback<
     klass, &klass::handle_v2_get_name>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(RBD_DIRECTORY, comp, &op, &m_out_bl);
@@ -207,7 +207,7 @@ void OpenRequest<I>::send_v2_get_immutable_metadata() {
   cls_client::get_immutable_metadata_start(&op);
 
   using klass = OpenRequest<I>;
-  librados::AioCompletion *comp = create_rados_ack_callback<
+  librados::AioCompletion *comp = create_rados_callback<
     klass, &klass::handle_v2_get_immutable_metadata>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(m_image_ctx->header_oid, comp, &op,
@@ -245,7 +245,7 @@ void OpenRequest<I>::send_v2_get_stripe_unit_count() {
   cls_client::get_stripe_unit_count_start(&op);
 
   using klass = OpenRequest<I>;
-  librados::AioCompletion *comp = create_rados_ack_callback<
+  librados::AioCompletion *comp = create_rados_callback<
     klass, &klass::handle_v2_get_stripe_unit_count>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(m_image_ctx->header_oid, comp, &op,
@@ -288,7 +288,7 @@ void OpenRequest<I>::send_v2_get_data_pool() {
   cls_client::get_data_pool_start(&op);
 
   using klass = OpenRequest<I>;
-  librados::AioCompletion *comp = create_rados_ack_callback<
+  librados::AioCompletion *comp = create_rados_callback<
     klass, &klass::handle_v2_get_data_pool>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(m_image_ctx->header_oid, comp, &op,
@@ -343,7 +343,7 @@ void OpenRequest<I>::send_v2_apply_metadata() {
 
   using klass = OpenRequest<I>;
   librados::AioCompletion *comp =
-    create_rados_ack_callback<klass, &klass::handle_v2_apply_metadata>(this);
+    create_rados_callback<klass, &klass::handle_v2_apply_metadata>(this);
   m_out_bl.clear();
   m_image_ctx->md_ctx.aio_operate(m_image_ctx->header_oid, comp, &op,
                                   &m_out_bl);