librados: deprecate aio_operate() read variant that takes snapid

The argument was ignored.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 2ce85310a0254c9e2fd6d5203b064d1819585435..2582167c2fea2789c82bf5d840030fb480a95f79 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -777,8 +777,14 @@ namespace librados
                    std::vector<snap_t>& snaps);
     int aio_operate(const std::string& oid, AioCompletion *c,
                    ObjectReadOperation *op, bufferlist *pbl);
+
     int aio_operate(const std::string& oid, AioCompletion *c,
                    ObjectReadOperation *op, snap_t snapid, int flags,
+                   bufferlist *pbl)
+      __attribute__ ((deprecated ("use aio_operate without snapid argument")));
+
+    int aio_operate(const std::string& oid, AioCompletion *c,
+                   ObjectReadOperation *op, int flags,
                    bufferlist *pbl);
 
     // watch/notify

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index dd199abd0ec8e0b1d56369e46a8440b05d64b36d..ad93689fa308b8c7b607c8cc2470138a26c543f1 100644 (file)
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -1020,9 +1020,28 @@ int librados::IoCtx::aio_operate(const std::string& oid, AioCompletion *c,
                                       0, pbl);
 }
 
+// deprecated
 int librados::IoCtx::aio_operate(const std::string& oid, AioCompletion *c,
                                 librados::ObjectReadOperation *o, 
-                                snap_t snapid, int flags, bufferlist *pbl)
+                                snap_t snapid_unused_deprecated,
+                                int flags, bufferlist *pbl)
+{
+  object_t obj(oid);
+  int op_flags = 0;
+  if (flags & OPERATION_BALANCE_READS)
+    op_flags |= CEPH_OSD_FLAG_BALANCE_READS;
+  if (flags & OPERATION_LOCALIZE_READS)
+    op_flags |= CEPH_OSD_FLAG_LOCALIZE_READS;
+  if (flags & OPERATION_ORDER_READS_WRITES)
+    op_flags |= CEPH_OSD_FLAG_RWORDERED;
+
+  return io_ctx_impl->aio_operate_read(obj, (::ObjectOperation*)o->impl, c->pc,
+                                      op_flags, pbl);
+}
+
+int librados::IoCtx::aio_operate(const std::string& oid, AioCompletion *c,
+                                librados::ObjectReadOperation *o,
+                                int flags, bufferlist *pbl)
 {
   object_t obj(oid);
   return io_ctx_impl->aio_operate_read(obj, (::ObjectOperation*)o->impl, c->pc,

diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc
index 11e111f75142be2fb5ff3a852811a65fa575f08a..6e4a05e6945c14f4fddf54b8fd874d811b756967 100644 (file)
--- a/src/librbd/AioRequest.cc
+++ b/src/librbd/AioRequest.cc
@@ -99,7 +99,7 @@ namespace librbd {
     } else {
       op.read(m_object_off, m_object_len, &m_read_data, NULL);
     }
-    r = m_ioctx->aio_operate(m_oid, rados_completion, &op, m_snap_id, flags, NULL);
+    r = m_ioctx->aio_operate(m_oid, rados_completion, &op, flags, NULL);
 
     rados_completion->release();
     return r;

diff --git a/src/librbd/LibrbdWriteback.cc b/src/librbd/LibrbdWriteback.cc
index da02a34ed329b68d7e66560636998aafb81a187d..ddb882dfbbb9ca1fe09dcb6354a218c7e1b92b36 100644 (file)
--- a/src/librbd/LibrbdWriteback.cc
+++ b/src/librbd/LibrbdWriteback.cc
@@ -103,7 +103,7 @@ namespace librbd {
     op.read(off, len, pbl, NULL);
     int flags = m_ictx->get_read_flags(snapid);
     int r = m_ictx->data_ctx.aio_operate(oid.name, rados_completion, &op,
-                                        snapid, flags, NULL);
+                                        flags, NULL);
     rados_completion->release();
     assert(r >= 0);
   }

diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc
index c866c2ff9694694fa414c102bb60dbe295c3526b..883234f0ee5295d8c5ce507bc8e086098c2d40b4 100644 (file)
--- a/src/test/librados/tier.cc
+++ b/src/test/librados/tier.cc
@@ -154,7 +154,7 @@ TEST(LibRadosTier, Overlay) {
     op.read(0, 1, &bl, NULL);
     librados::AioCompletion *completion = cluster.aio_create_completion();
     ASSERT_EQ(0, base_ioctx.aio_operate(
-       "foo", completion, &op, librados::SNAP_HEAD,
+       "foo", completion, &op,
        librados::OPERATION_IGNORE_OVERLAY, NULL));
     completion->wait_for_safe();
     ASSERT_EQ(0, completion->get_return_value());

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index ad6965debfb5f02cd2754402bbb960e22eda4013..6caefe4afb42735cfa69482904d301748fca751d 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -857,7 +857,6 @@ public:
     context->io_ctx.aio_operate(
       context->prefix+oid, rcompletion,
       &read_op,
-      librados::SNAP_HEAD,
       librados::OPERATION_ORDER_READS_WRITES,  // order wrt previous write/update
       0);
   }
@@ -1482,7 +1481,6 @@ public:
                                                            NULL);
     rd_op.stat(NULL, NULL, NULL);
     context->io_ctx.aio_operate(context->prefix+oid, comp_racing_read, &rd_op,
-                               librados::SNAP_HEAD,
                                librados::OPERATION_ORDER_READS_WRITES,  // order wrt previous write/update
                                NULL);