From: JonBailey1993 <jonathan.bailey1@ibm.com>
Date: Tue, 8 Oct 2024 08:43:10 +0000 (+0100)
Subject: common/io_exerciser: Add version argument to callbacks in ceph_radios_io_sequence
X-Git-Tag: testing/wip-vshankar-testing-20241016.135728-debug~56^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5b90117348d030db16738ae06e9308ade4355bb0;p=ceph-ci.git

common/io_exerciser: Add version argument to callbacks in ceph_radios_io_sequence

Add new version that was missing from ceph_test_rados_io_sequence callbacks due to interface changes

Signed-off-by: Jon Bailey <jonathan.bailey1@ibm.com>
---

diff --git a/src/common/io_exerciser/RadosIo.cc b/src/common/io_exerciser/RadosIo.cc
index 3f907ccf474..41be2885f3f 100644
--- a/src/common/io_exerciser/RadosIo.cc
+++ b/src/common/io_exerciser/RadosIo.cc
@@ -118,7 +118,8 @@ void RadosIo::applyIoOp(IoOp &op)
       op_info = std::make_shared<AsyncOpInfo>(0, op.length1);
       op_info->bl1 = db->generate_data(0, op.length1);
       op_info->wop.write_full(op_info->bl1);
-      auto create_cb = [this] (boost::system::error_code ec) {
+      auto create_cb = [this] (boost::system::error_code ec,
+                               version_t ver) {
         ceph_assert(ec == boost::system::errc::success);
         finish_io();
       };
@@ -132,7 +133,8 @@ void RadosIo::applyIoOp(IoOp &op)
       start_io();
       op_info = std::make_shared<AsyncOpInfo>();
       op_info->wop.remove();
-      auto remove_cb = [this] (boost::system::error_code ec) {
+      auto remove_cb = [this] (boost::system::error_code ec,
+                               version_t ver) {
         ceph_assert(ec == boost::system::errc::success);
         finish_io();
       };
@@ -148,7 +150,9 @@ void RadosIo::applyIoOp(IoOp &op)
       op_info->rop.read(op.offset1 * block_size,
                         op.length1 * block_size,
                         &op_info->bl1, nullptr);
-      auto read_cb = [this, op_info] (boost::system::error_code ec, bufferlist bl) {
+      auto read_cb = [this, op_info] (boost::system::error_code ec,
+                                      version_t ver,
+                                      bufferlist bl) {
         ceph_assert(ec == boost::system::errc::success);
         db->validate(op_info->bl1, op_info->offset1, op_info->length1);
         finish_io();
@@ -174,6 +178,7 @@ void RadosIo::applyIoOp(IoOp &op)
                     op.length2 * block_size,
                     &op_info->bl2, nullptr);
       auto read2_cb = [this, op_info] (boost::system::error_code ec,
+                                       version_t ver,
                                        bufferlist bl) {
         ceph_assert(ec == boost::system::errc::success);
         db->validate(op_info->bl1, op_info->offset1, op_info->length1);
@@ -202,6 +207,7 @@ void RadosIo::applyIoOp(IoOp &op)
                     op.length3 * block_size,
                     &op_info->bl3, nullptr);
       auto read3_cb = [this, op_info] (boost::system::error_code ec,
+                                       version_t ver,
                                        bufferlist bl) {
         ceph_assert(ec == boost::system::errc::success);
         db->validate(op_info->bl1, op_info->offset1, op_info->length1);
@@ -222,7 +228,8 @@ void RadosIo::applyIoOp(IoOp &op)
       op_info->bl1 = db->generate_data(op.offset1, op.length1);
 
       op_info->wop.write(op.offset1 * block_size, op_info->bl1);
-      auto write_cb = [this] (boost::system::error_code ec) {
+      auto write_cb = [this] (boost::system::error_code ec,
+                              version_t ver) {
         ceph_assert(ec == boost::system::errc::success);
         finish_io();
       };
@@ -241,7 +248,8 @@ void RadosIo::applyIoOp(IoOp &op)
       op_info->bl2 = db->generate_data(op.offset2, op.length2);
       op_info->wop.write(op.offset1 * block_size, op_info->bl1);
       op_info->wop.write(op.offset2 * block_size, op_info->bl2);
-      auto write2_cb = [this] (boost::system::error_code ec) {
+      auto write2_cb = [this] (boost::system::error_code ec,
+                               version_t ver) {
         ceph_assert(ec == boost::system::errc::success);
         finish_io();
       };
@@ -263,7 +271,8 @@ void RadosIo::applyIoOp(IoOp &op)
       op_info->wop.write(op.offset1 * block_size, op_info->bl1);
       op_info->wop.write(op.offset2 * block_size, op_info->bl2);
       op_info->wop.write(op.offset3 * block_size, op_info->bl3);
-      auto write3_cb = [this] (boost::system::error_code ec) {
+      auto write3_cb = [this] (boost::system::error_code ec,
+                               version_t ver) {
         ceph_assert(ec == boost::system::errc::success);
         finish_io();
       };