Merge pull request ceph#64136 from JonBailey1993/ceph_test_rados_io_sequence_10_bug_fix

test/osd: Fix pack for minor issues in ceph_test_rados_io_sequence

Reviewed-by: Ronen Friedman <[email protected]>

Author: JonBailey1993

src/common/json/OSDStructures.cc

@@ -183,4 +183,21 @@ void InjectECClearParityRead::dump(Formatter* f) const {
 void InjectECClearParityRead::decode_json(JSONObj* obj) {
   JSONDecoder::decode_json("pool", pool, obj);
   JSONDecoder::decode_json("objname", objname, obj);
+}
+
+void OSDEnableApplicationRequest::dump(Formatter* f) const {
+  encode_json("prefix", "osd pool application enable", f);
+  encode_json("pool", pool, f);
+  encode_json("app", app, f);
+  encode_json("yes_i_really_mean_it", yes_i_really_mean_it, f);
+  encode_json("key", key, f);
+  encode_json("value", value, f);
+}
+
+void OSDEnableApplicationRequest::decode_json(JSONObj* obj) {
+  JSONDecoder::decode_json("pool", pool, obj);
+  JSONDecoder::decode_json("app", app, obj);
+  JSONDecoder::decode_json("yes_i_really_mean_it", yes_i_really_mean_it, obj);
+  JSONDecoder::decode_json("key", key, obj);
+  JSONDecoder::decode_json("value", value, obj);
 }

src/common/json/OSDStructures.h

@@ -113,6 +113,17 @@ struct OSDSetRequest {
   void decode_json(JSONObj* obj);
 };
 
+  struct OSDEnableApplicationRequest {
+    std::string pool;
+    std::string app;
+    std::optional<bool> yes_i_really_mean_it;
+    std::optional<std::string> key;
+    std::optional<std::string> value;
+
+    void dump(Formatter* f) const;
+    void decode_json(JSONObj* obj);
+  };
+
 // These structures are sent directly to the relevant OSD
 // rather than the monitor
 template <io_exerciser::InjectOpType op_type>

src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.cc

@@ -161,8 +161,11 @@ constexpr std::string_view usage[] = {
     "\t\t read|write|failedwrite <off> <len>",
     "\t\t read2|write2|failedwrite2 <off> <len> <off> <len>",
     "\t\t read3|write3|failedwrite3 <off> <len> <off> <len> <off> <len>",
-    "\t\t injecterror <type> <shard> <good_count> <fail_count>",
-    "\t\t clearinject <type> <shard>",
+    "\t\t append",
+    "\t\t truncate",
+    "\t\t injecterror <io_type> <shard> <type> <good_count> <fail_count>",
+    "\t\t clearinject <io_type> <shard> <type>",
+    "\t\t sleep",
     "\t\t done"};
 
 po::options_description get_options_description() {
@@ -849,6 +852,8 @@ const std::string ceph::io_sequence::tester::SelectErasurePool::select() {
       configureServices(allow_pool_autoscaling, allow_pool_balancer,
                         allow_pool_deep_scrubbing, allow_pool_scrubbing,
                         test_recovery);
+
+      setApplication(created_pool_name);
     }
   }
 
@@ -874,6 +879,21 @@ std::string ceph::io_sequence::tester::SelectErasurePool::create() {
   return pool_name;
 }
 
+void ceph::io_sequence::tester::SelectErasurePool::setApplication(
+    const std::string& pool_name) {
+  bufferlist inbl, outbl;
+  auto formatter = std::make_shared<JSONFormatter>(false);
+
+  ceph::messaging::osd::OSDEnableApplicationRequest
+  enableApplicationRequest{pool_name, "rados"};
+
+  int rc = send_mon_command(enableApplicationRequest, rados,
+                            "OSDEnableApplicationRequest", inbl, &outbl,
+                            formatter.get());
+
+  ceph_assert(rc == 0);
+}
+
 void ceph::io_sequence::tester::SelectErasurePool::configureServices(
     bool allow_pool_autoscaling,
     bool allow_pool_balancer,
@@ -1084,7 +1104,7 @@ ceph::io_sequence::tester::TestRunner::TestRunner(
           vm.contains("allow_pool_balancer"),
           vm.contains("allow_pool_deep_scrubbing"),
           vm.contains("allow_pool_scrubbing"),
-          vm.contains("test_recovery"),
+          vm.contains("testrecovery"),
           vm.contains("disable_pool_ec_optimizations")},
       snt{rng, vm, "threads", true},
       ssr{vm} {
@@ -1109,6 +1129,11 @@ ceph::io_sequence::tester::TestRunner::TestRunner(
   allow_pool_scrubbing = vm.contains("allow_pool_scrubbing");
   disable_pool_ec_optimizations = vm.contains("disable_pool_ec_optimizations");
 
+  if (testrecovery && (num_objects > 1)) {
+    throw std::invalid_argument("testrecovery option not allowed if parallel is"
+                                " specified, except when parallel=1 is used");
+  }
+
   if (!dryrun) {
     guard.emplace(boost::asio::make_work_guard(asio));
     thread = make_named_thread("io_thread", [&asio = asio] { asio.run(); });

src/test/osd/ceph_test_rados_io_sequence/ceph_test_rados_io_sequence.h

@@ -392,11 +392,6 @@ class SelectErasurePool : public ProgramOptionReader<std::string> {
                     bool disable_pool_ec_optimizations);
   const std::string select() override;
   std::string create();
-  void configureServices(bool allow_pool_autoscaling,
-                         bool allow_pool_balancer,
-                         bool allow_pool_deep_scrubbing,
-                         bool allow_pool_scrubbing,
-                         bool test_recovery);
 
   inline bool get_allow_pool_autoscaling() { return allow_pool_autoscaling; }
   inline bool get_allow_pool_balancer() { return allow_pool_balancer; }
@@ -425,6 +420,14 @@ class SelectErasurePool : public ProgramOptionReader<std::string> {
   SelectErasureProfile sep;
 
   std::optional<Profile> profile;
+
+  void configureServices(bool allow_pool_autoscaling,
+                         bool allow_pool_balancer,
+                         bool allow_pool_deep_scrubbing,
+                         bool allow_pool_scrubbing,
+                         bool test_recovery);
+
+ void setApplication(const std::string& pool_name);
 };
 
 class TestObject {