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 8c791bbc0eb3e82ecc008b6da77c74bb67c2768b..cfd38513b142d03d3fadc4368dbf74d147de88bf 100644 (file)
--- 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 6cd682f4eb5860bf7fed79ef31462119c5b3d087..59bb714bc16c66c1e70a2792e7de32fb623aa186 100644 (file)
--- 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 e6de83372ad817814f7bc31788cec932be51745c..fd687f5acaf996d31826ee11fbc9859510a541dc 100644 (file)
--- 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