From: Adam Lyon-Jones <adamlyon@uk.ibm.com>
Date: Thu, 25 Sep 2025 09:04:36 +0000 (+0100)
Subject: Implement further review feedback for CopyFrom changes to ceph_test_rados_io_sequence
X-Git-Tag: testing/wip-vshankar-testing-20250929.160013-debug~12^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c4c4c4a7daccfeab640025717d7da2454226f976;p=ceph-ci.git

Implement further review feedback for CopyFrom changes to ceph_test_rados_io_sequence

Signed-off-by: Adam Lyon-Jones <adamlyon@uk.ibm.com>
---

diff --git a/src/common/io_exerciser/Model.cc b/src/common/io_exerciser/Model.cc
index 8c791bbc0eb..cfd38513b14 100644
--- a/src/common/io_exerciser/Model.cc
+++ b/src/common/io_exerciser/Model.cc
@@ -22,7 +22,7 @@ void Model::set_secondary_oid(const std::string& new_oid) {
 void Model::swap_primary_secondary_oid() {
     std::string old_primary;
     old_primary = get_primary_oid();
-    set_primary_oid(Model::get_secondary_oid());
+    set_primary_oid(get_secondary_oid());
     set_secondary_oid(old_primary);
 }
 
diff --git a/src/common/io_exerciser/ObjectModel.cc b/src/common/io_exerciser/ObjectModel.cc
index 6cd682f4eb5..59bb714bc16 100644
--- a/src/common/io_exerciser/ObjectModel.cc
+++ b/src/common/io_exerciser/ObjectModel.cc
@@ -222,22 +222,3 @@ void ObjectModel::applyIoOp(IoOp& op) {
       break;
   }
 }
-
-void ObjectModel::encode(ceph::buffer::list& bl) const {
-  ENCODE_START(1, 1, bl);
-  encode(primary_created, bl);
-  if (primary_created) {
-    encode(primary_contents, bl);
-  }
-  ENCODE_FINISH(bl);
-}
-
-void ObjectModel::decode(ceph::buffer::list::const_iterator& bl) {
-  DECODE_START(1, bl);
-  DECODE_OLDEST(1);
-  decode(primary_created, bl);
-  if (primary_created) {
-    decode(primary_contents, bl);
-  }
-  DECODE_FINISH(bl);
-}
diff --git a/src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.cc b/src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.cc
index e6de83372ad..fd687f5acaf 100644
--- a/src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.cc
+++ b/src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.cc
@@ -1313,13 +1313,6 @@ bool ceph::io_sequence::tester::TestRunner::run_interactive_test() {
   } else {
     const std::string pool = spo.select();
 
-    bufferlist inbl, outbl;
-    auto formatter = std::make_unique<JSONFormatter>(false);
-
-    JSONParser p;
-    bool success = p.parse(outbl.c_str(), outbl.length());
-    ceph_assert(success);
-
     model = std::make_unique<ceph::io_exerciser::RadosIo>(
         rados, asio, pool, primary_object_name, secondary_object_name, sbs.select(), rng(),
         1,  // 1 thread