From a4ee4ba0ca13bf81687c52998faf9161d29595ea Mon Sep 17 00:00:00 2001 From: Adam Lyon-Jones Date: Tue, 9 Sep 2025 09:26:10 +0100 Subject: [PATCH] Implement review feedback and remove unused variables from ceph_test_rados_io_sequence Signed-off-by: Adam Lyon-Jones --- src/common/io_exerciser/Model.cc | 8 +-- src/common/io_exerciser/RadosIo.cc | 2 - src/common/io_exerciser/RadosIo.h | 2 - .../ceph_test_rados_io_sequence.cc | 51 ++----------------- 4 files changed, 8 insertions(+), 55 deletions(-) diff --git a/src/common/io_exerciser/Model.cc b/src/common/io_exerciser/Model.cc index 536c406539a..8c791bbc0eb 100644 --- a/src/common/io_exerciser/Model.cc +++ b/src/common/io_exerciser/Model.cc @@ -21,11 +21,11 @@ void Model::set_secondary_oid(const std::string& new_oid) { void Model::swap_primary_secondary_oid() { std::string old_primary; - old_primary = Model::get_primary_oid(); - Model::set_primary_oid(Model::get_secondary_oid()); - Model::set_secondary_oid(old_primary); + old_primary = get_primary_oid(); + set_primary_oid(Model::get_secondary_oid()); + set_secondary_oid(old_primary); } const uint64_t Model::get_block_size() const { return block_size; } -int Model::get_num_io() const { return num_io; } \ No newline at end of file +int Model::get_num_io() const { return num_io; } diff --git a/src/common/io_exerciser/RadosIo.cc b/src/common/io_exerciser/RadosIo.cc index 90fc8c217c9..3985665a055 100644 --- a/src/common/io_exerciser/RadosIo.cc +++ b/src/common/io_exerciser/RadosIo.cc @@ -44,7 +44,6 @@ int send_mon_command(S& s, librados::Rados& rados, const char* name, RadosIo::RadosIo(librados::Rados& rados, boost::asio::io_context& asio, const std::string& pool, const std::string& primary_oid, const std::string& secondary_oid, - const std::optional>& cached_shard_order, uint64_t block_size, int seed, int threads, ceph::mutex& lock, ceph::condition_variable& cond, bool is_replicated_pool, bool ec_optimizations) @@ -55,7 +54,6 @@ RadosIo::RadosIo(librados::Rados& rados, boost::asio::io_context& asio, db(data_generation::DataGenerator::create_generator( data_generation::GenerationType::HeaderedSeededRandom, *om)), pool(pool), - cached_shard_order(cached_shard_order), threads(threads), lock(lock), cond(cond), diff --git a/src/common/io_exerciser/RadosIo.h b/src/common/io_exerciser/RadosIo.h index d1464f3545c..593f5e8e604 100644 --- a/src/common/io_exerciser/RadosIo.h +++ b/src/common/io_exerciser/RadosIo.h @@ -32,7 +32,6 @@ class RadosIo : public Model { std::unique_ptr db; std::unique_ptr cc; std::string pool; - std::optional> cached_shard_order; int threads; ceph::mutex& lock; ceph::condition_variable& cond; @@ -46,7 +45,6 @@ class RadosIo : public Model { public: RadosIo(librados::Rados& rados, boost::asio::io_context& asio, const std::string& pool, const std::string& primary_oid, const std::string& secondary_oid, - const std::optional>& cached_shard_order, uint64_t block_size, int seed, int threads, ceph::mutex& lock, ceph::condition_variable& cond, bool is_replicated_pool, bool ec_optimizations); 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 42348343893..e6de83372ad 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 @@ -1047,38 +1047,11 @@ ceph::io_sequence::tester::TestObject::TestObject( bufferlist inbl, outbl; auto formatter = std::make_unique(false); - std::optional> cached_shard_order = std::nullopt; - - if (!spo.get_allow_pool_autoscaling() && !spo.get_allow_pool_balancer() && - !spo.get_allow_pool_deep_scrubbing() && - !spo.get_allow_pool_scrubbing()) { - { - ceph::messaging::osd::OSDMapRequest osdMapRequest{pool, primary_oid, ""}; - int rc = send_mon_command(osdMapRequest, rados, "OSDMapRequest", inbl, - &outbl, formatter.get()); - ceph_assert(rc == 0); - } - { - ceph::messaging::osd::OSDMapRequest osdMapRequest{pool, secondary_oid, ""}; - int rc = send_mon_command(osdMapRequest, rados, "OSDMapRequest", inbl, - &outbl, formatter.get()); - ceph_assert(rc == 0); - } - - JSONParser p; - bool success = p.parse(outbl.c_str(), outbl.length()); - ceph_assert(success); - - ceph::messaging::osd::OSDMapReply reply{}; - reply.decode_json(&p); - cached_shard_order = reply.acting; - } - exerciser_model = std::make_unique( - rados, asio, pool, primary_oid, secondary_cached_shard_order, sbs.select(), rng(), + rados, asio, pool, primary_oid, secondary_oid, sbs.select(), rng(), threads, lock, cond, spo.is_replicated_pool(), spo.get_allow_pool_ec_optimizations()); - dout(0) << "= " << oid << " pool=" << pool << " threads=" << threads + dout(0) << "= " << primary_oid << " pool=" << pool << " threads=" << threads << " blocksize=" << exerciser_model->get_block_size() << " =" << dendl; } @@ -1195,7 +1168,7 @@ ceph::io_sequence::tester::TestRunner::TestRunner( allow_pool_deep_scrubbing = vm.contains("allow_pool_deep_scrubbing"); allow_pool_scrubbing = vm.contains("allow_pool_scrubbing"); - if (testrecovery && (num_objects > 1)) { + if (testrecovery && (num_object_pairs > 1)) { throw std::invalid_argument("testrecovery option not allowed if parallel is" " specified, except when parallel=1 is used"); } @@ -1343,28 +1316,12 @@ bool ceph::io_sequence::tester::TestRunner::run_interactive_test() { bufferlist inbl, outbl; auto formatter = std::make_unique(false); - { - ceph::messaging::osd::OSDMapRequest osd_map_request{pool, primary_object_name, ""}; - int rc = send_mon_command(osd_map_request, rados, "OSDMapRequest", inbl, - &outbl, formatter.get()); - ceph_assert(rc == 0); - } - { - ceph::messaging::osd::OSDMapRequest osdMapRequest{pool, secondary_object_name, ""}; - int rc = send_mon_command(osdMapRequest, rados, "OSDMapRequest", inbl, - &outbl, formatter.get()); - ceph_assert(rc == 0); - } - JSONParser p; bool success = p.parse(outbl.c_str(), outbl.length()); ceph_assert(success); - ceph::messaging::osd::OSDMapReply osd_map_reply{}; - osd_map_reply.decode_json(&p); - model = std::make_unique( - rados, asio, pool, primary_object_name, secondary_object_name, osd_map_reply.acting, sbs.select(), rng(), + rados, asio, pool, primary_object_name, secondary_object_name, sbs.select(), rng(), 1, // 1 thread lock, cond, spo.is_replicated_pool(), spo.get_allow_pool_ec_optimizations()); -- 2.39.5