Merge pull request #27011 from liewegas/wip-redirect-mimic

qa/suites/upgrade/mimic-x/parallel: enable all classes

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

2 files changed, 5 insertions, 66 deletions

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index 38282ab50a0..0625269eb2f 100644
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
@@ -43,8 +43,6 @@ overrides:
       mon:
         mon warn on osd down out interval zero: false
       osd:
-        osd_class_load_list: "cephfs hello journal lock log numops rbd refcount 
-                              rgw sdk timeindex user version"
-        osd_class_default_list: "cephfs hello journal lock log numops rbd refcount 
-                                 rgw sdk timeindex user version"
+        osd_class_load_list: "*"
+        osd_class_default_list: "*"
     fs: xfs
diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
index e6acd304771..a9727c08e0b 100644
--- a/src/test/librados/tier_cxx.cc
+++ b/src/test/librados/tier_cxx.cc
@@ -2900,19 +2900,6 @@ TEST_F(LibRadosTwoPoolsPP, CachePin) {
 }
 
 TEST_F(LibRadosTwoPoolsPP, SetRedirectRead) {
-  // skip test if not yet luminous
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("luminous") == std::string::npos) {
-      cout << "cluster is not yet luminous, skipping test" << std::endl;
-      return;
-    }
-  }
-
   // create object
   {
     bufferlist bl;
@@ -3161,18 +3148,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestPromoteRead) {
 }
 
 TEST_F(LibRadosTwoPoolsPP, ManifestRefRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {
@@ -6181,19 +6157,6 @@ TEST_F(LibRadosTwoPoolsECPP, CachePin) {
   cluster.wait_for_latest_osdmap();
 }
 TEST_F(LibRadosTwoPoolsECPP, SetRedirectRead) {
-  // skip test if not yet luminous
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("luminous") == std::string::npos) {
-      cout << "cluster is not yet luminous, skipping test" << std::endl;
-      return;
-    }
-  }
-
   // create object
   {
     bufferlist bl;
@@ -6247,18 +6210,7 @@ TEST_F(LibRadosTwoPoolsECPP, SetRedirectRead) {
 }
 
 TEST_F(LibRadosTwoPoolsECPP, SetChunkRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {
@@ -6322,18 +6274,7 @@ TEST_F(LibRadosTwoPoolsECPP, SetChunkRead) {
 }
 
 TEST_F(LibRadosTwoPoolsECPP, ManifestPromoteRead) {
-  // skip test if not yet mimic
-  {
-    bufferlist inbl, outbl;
-    ASSERT_EQ(0, cluster.mon_command(
-		"{\"prefix\": \"osd dump\"}",
-		inbl, &outbl, NULL));
-    string s(outbl.c_str(), outbl.length());
-    if (s.find("mimic") == std::string::npos) {
-      cout << "cluster is not yet mimic, skipping test" << std::endl;
-      return;
-    }
-  }
+  // note: require >= mimic
 
   // create object
   {