src/test/librados: enable FastEC tests with crimson

This commit enables fast EC tests such that they are run for crimson
OSDs. This is done towards an effort to establish reliable fast EC
support in crimson.

These tests where previously enabled as part of another PR but
ultimately were not merged due to insufficient confidence.

Fixes: https://tracker.ceph.com/issues/77910
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc
index 3be0a0c1ca7d740ea555232941ee13957759320a..f0c82c209bc96a2de2c8d4b90d3cb6e879ec92f1 100644 (file)
--- a/src/test/librados/TestCase.cc
+++ b/src/test/librados/TestCase.cc
@@ -174,7 +174,6 @@ rados_t RadosTestEC::s_cluster = NULL;
 
 void RadosTestEC::SetUpTestCase()
 {
-  SKIP_IF_CRIMSON();
   auto pool_prefix = fmt::format("{}_", ::testing::UnitTest::GetInstance()->current_test_case()->name()); 
   pool_name_default = get_temp_pool_name(pool_prefix);
   pool_name_fast = get_temp_pool_name(pool_prefix);
@@ -187,7 +186,6 @@ void RadosTestEC::SetUpTestCase()
 
 void RadosTestEC::TearDownTestCase()
 {
-  SKIP_IF_CRIMSON();
   ASSERT_EQ(0, destroy_ec_pool(pool_name_default, &s_cluster));
   ASSERT_EQ(0, destroy_ec_pool(pool_name_fast, &s_cluster));
   ASSERT_EQ(0, destroy_ec_pool(pool_name_fast_split, &s_cluster));
@@ -196,8 +194,6 @@ void RadosTestEC::TearDownTestCase()
 
 void RadosTestEC::SetUp()
 {
-  SKIP_IF_CRIMSON();
-
   const auto& params = GetParam();
   bool fast_ec = std::get<0>(params);
   bool split_ops = std::get<1>(params);
@@ -223,7 +219,6 @@ void RadosTestEC::SetUp()
 
 void RadosTestEC::TearDown()
 {
-  SKIP_IF_CRIMSON();
   if (cleanup) {
     cleanup_default_namespace(ioctx);
     cleanup_namespace(ioctx, nspace);

diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
index 1b9be01984394a628bad6d6d2ecb5ed7a1fccfd5..fa5ad189704b1596dea6c82404010c0c932ac7ee 100644 (file)
--- a/src/test/librados/aio.cc
+++ b/src/test/librados/aio.cc
@@ -1103,7 +1103,6 @@ public:
 class LibRadosAioEC : public ::testing::TestWithParam<std::tuple<bool, bool>> {};
 
 TEST_P(LibRadosAioEC, SimpleWrite) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1138,7 +1137,6 @@ TEST_P(LibRadosAioEC, SimpleWrite) {
 }
 
 TEST_P(LibRadosAioEC, WaitForComplete) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1158,7 +1156,6 @@ TEST_P(LibRadosAioEC, WaitForComplete) {
 }
 
 TEST_P(LibRadosAioEC, RoundTrip) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1194,7 +1191,6 @@ TEST_P(LibRadosAioEC, RoundTrip) {
 }
 
 TEST_P(LibRadosAioEC, RoundTrip2) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1304,7 +1300,6 @@ TEST_P(LibRadosAioEC, RoundTripAppend) {
 }
 
 TEST_P(LibRadosAioEC, IsComplete) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1347,7 +1342,6 @@ TEST_P(LibRadosAioEC, IsComplete) {
 }
 
 TEST_P(LibRadosAioEC, IsSafe) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1390,7 +1384,6 @@ TEST_P(LibRadosAioEC, IsSafe) {
 }
 
 TEST_P(LibRadosAioEC, ReturnValue) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1412,7 +1405,6 @@ TEST_P(LibRadosAioEC, ReturnValue) {
 }
 
 TEST_P(LibRadosAioEC, Flush) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1445,7 +1437,6 @@ TEST_P(LibRadosAioEC, Flush) {
 }
 
 TEST_P(LibRadosAioEC, FlushAsync) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1487,7 +1478,6 @@ TEST_P(LibRadosAioEC, FlushAsync) {
 }
 
 TEST_P(LibRadosAioEC, RoundTripWriteFull) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion, my_completion2, my_completion3;
   const auto& params = GetParam();
@@ -1534,7 +1524,6 @@ TEST_P(LibRadosAioEC, RoundTripWriteFull) {
 }
 
 TEST_P(LibRadosAioEC, SimpleStat) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1571,7 +1560,6 @@ TEST_P(LibRadosAioEC, SimpleStat) {
 
 
 TEST_P(LibRadosAioEC, SimpleStatNS) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1635,7 +1623,6 @@ TEST_P(LibRadosAioEC, SimpleStatNS) {
 }
 
 TEST_P(LibRadosAioEC, StatRemove) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();
@@ -1694,7 +1681,6 @@ TEST_P(LibRadosAioEC, StatRemove) {
 }
 
 TEST_P(LibRadosAioEC, ExecuteClass) {
-  SKIP_IF_CRIMSON();
   AioTestDataEC test_data;
   rados_completion_t my_completion;
   const auto& params = GetParam();

diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc
index d97ca98351d4a99167da3dece4a7c37d4c10adb7..725c00385ee39ad78a1448a90beb03df276a5177 100644 (file)
--- a/src/test/librados/io.cc
+++ b/src/test/librados/io.cc
@@ -270,7 +270,6 @@ TEST_P(LibRadosIo, XattrIter) {
 }
 
 TEST_P(LibRadosIoEC, SimpleWrite) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
@@ -279,7 +278,6 @@ TEST_P(LibRadosIoEC, SimpleWrite) {
 }
 
 TEST_P(LibRadosIoEC, RoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[128];
   memset(buf, 0xcc, sizeof(buf));
@@ -295,7 +293,6 @@ TEST_P(LibRadosIoEC, RoundTrip) {
 }
 
 TEST_P(LibRadosIoEC, OverlappingWriteRoundTrip) {
-  SKIP_IF_CRIMSON();
   int bsize = alignment;
   int dbsize = bsize * 2;
   char *buf = (char *)new char[dbsize];
@@ -320,7 +317,6 @@ TEST_P(LibRadosIoEC, OverlappingWriteRoundTrip) {
 }
 
 TEST_P(LibRadosIoEC, WriteFullRoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[64];
   char buf3[128];
@@ -334,7 +330,6 @@ TEST_P(LibRadosIoEC, WriteFullRoundTrip) {
 }
 
 TEST_P(LibRadosIoEC, AppendRoundTrip) {
-  SKIP_IF_CRIMSON();
   char *buf = (char *)new char[alignment];
   char *buf2 = (char *)new char[alignment];
   char *buf3 = (char *)new char[alignment *2];
@@ -363,7 +358,6 @@ TEST_P(LibRadosIoEC, AppendRoundTrip) {
 }
 
 TEST_P(LibRadosIoEC, TruncTest) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
@@ -379,7 +373,6 @@ TEST_P(LibRadosIoEC, TruncTest) {
 }
 
 TEST_P(LibRadosIoEC, RemoveTest) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
@@ -390,7 +383,6 @@ TEST_P(LibRadosIoEC, RemoveTest) {
 }
 
 TEST_P(LibRadosIoEC, XattrsRoundTrip) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
@@ -404,7 +396,6 @@ TEST_P(LibRadosIoEC, XattrsRoundTrip) {
 }
 
 TEST_P(LibRadosIoEC, RmXattr) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
@@ -428,7 +419,6 @@ TEST_P(LibRadosIoEC, RmXattr) {
 }
 
 TEST_P(LibRadosIoEC, XattrIter) {
-  SKIP_IF_CRIMSON();
   char buf[128];
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";