From d9a6755599d72cbc2f576e3b9c14579d3ab132f1 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Sun, 22 Mar 2026 08:26:19 +0000 Subject: [PATCH] Revert "crimson/osd, test: turn the EC tests on for crimson" This reverts commit 36fc26b2b803fcf425de674a578c4aba20a5d9ea. Signed-off-by: Radoslaw Zarzynski --- src/test/librados/TestCase.cc | 4 ++++ src/test/librados/aio.cc | 16 ++++++++++++++++ src/test/librados/io.cc | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/src/test/librados/TestCase.cc b/src/test/librados/TestCase.cc index b6610470d3aa..b224a4976505 100644 --- a/src/test/librados/TestCase.cc +++ b/src/test/librados/TestCase.cc @@ -165,6 +165,7 @@ 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 = get_temp_pool_name(pool_prefix); ASSERT_EQ("", create_one_ec_pool(pool_name, &s_cluster)); @@ -172,11 +173,13 @@ void RadosTestEC::SetUpTestCase() void RadosTestEC::TearDownTestCase() { + SKIP_IF_CRIMSON(); ASSERT_EQ(0, destroy_one_ec_pool(pool_name, &s_cluster)); } void RadosTestEC::SetUp() { + SKIP_IF_CRIMSON(); cluster = RadosTestEC::s_cluster; ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx)); nspace = get_temp_pool_name(); @@ -190,6 +193,7 @@ 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 c762891687ea..771a5f5d41ae 100644 --- a/src/test/librados/aio.cc +++ b/src/test/librados/aio.cc @@ -1099,6 +1099,7 @@ public: }; TEST(LibRadosAioEC, SimpleWrite) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1130,6 +1131,7 @@ TEST(LibRadosAioEC, SimpleWrite) { } TEST(LibRadosAioEC, WaitForComplete) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1146,6 +1148,7 @@ TEST(LibRadosAioEC, WaitForComplete) { } TEST(LibRadosAioEC, RoundTrip) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1178,6 +1181,7 @@ TEST(LibRadosAioEC, RoundTrip) { } TEST(LibRadosAioEC, RoundTrip2) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1210,6 +1214,7 @@ TEST(LibRadosAioEC, RoundTrip2) { } TEST(LibRadosAioEC, RoundTripAppend) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3, my_completion4; ASSERT_EQ("", test_data.init()); @@ -1280,6 +1285,7 @@ TEST(LibRadosAioEC, RoundTripAppend) { } TEST(LibRadosAioEC, IsComplete) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1319,6 +1325,7 @@ TEST(LibRadosAioEC, IsComplete) { } TEST(LibRadosAioEC, IsSafe) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1358,6 +1365,7 @@ TEST(LibRadosAioEC, IsSafe) { } TEST(LibRadosAioEC, ReturnValue) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1376,6 +1384,7 @@ TEST(LibRadosAioEC, ReturnValue) { } TEST(LibRadosAioEC, Flush) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1405,6 +1414,7 @@ TEST(LibRadosAioEC, Flush) { } TEST(LibRadosAioEC, FlushAsync) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1443,6 +1453,7 @@ TEST(LibRadosAioEC, FlushAsync) { } TEST(LibRadosAioEC, RoundTripWriteFull) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); @@ -1486,6 +1497,7 @@ TEST(LibRadosAioEC, RoundTripWriteFull) { } TEST(LibRadosAioEC, SimpleStat) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1519,6 +1531,7 @@ TEST(LibRadosAioEC, SimpleStat) { TEST(LibRadosAioEC, SimpleStatNS) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1579,6 +1592,7 @@ TEST(LibRadosAioEC, SimpleStatNS) { } TEST(LibRadosAioEC, StatRemove) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1634,6 +1648,7 @@ TEST(LibRadosAioEC, StatRemove) { } TEST(LibRadosAioEC, ExecuteClass) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion; ASSERT_EQ("", test_data.init()); @@ -1665,6 +1680,7 @@ TEST(LibRadosAioEC, ExecuteClass) { } TEST(LibRadosAioEC, MultiWrite) { + SKIP_IF_CRIMSON(); AioTestDataEC test_data; rados_completion_t my_completion, my_completion2, my_completion3; ASSERT_EQ("", test_data.init()); diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc index f391744de613..61f939711c4a 100644 --- a/src/test/librados/io.cc +++ b/src/test/librados/io.cc @@ -270,6 +270,7 @@ TEST_F(LibRadosIo, XattrIter) { } TEST_F(LibRadosIoEC, SimpleWrite) { + SKIP_IF_CRIMSON(); char buf[128]; memset(buf, 0xcc, sizeof(buf)); ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0)); @@ -278,6 +279,7 @@ TEST_F(LibRadosIoEC, SimpleWrite) { } TEST_F(LibRadosIoEC, RoundTrip) { + SKIP_IF_CRIMSON(); char buf[128]; char buf2[128]; memset(buf, 0xcc, sizeof(buf)); @@ -293,6 +295,7 @@ TEST_F(LibRadosIoEC, RoundTrip) { } TEST_F(LibRadosIoEC, OverlappingWriteRoundTrip) { + SKIP_IF_CRIMSON(); int bsize = alignment; int dbsize = bsize * 2; char *buf = (char *)new char[dbsize]; @@ -317,6 +320,7 @@ TEST_F(LibRadosIoEC, OverlappingWriteRoundTrip) { } TEST_F(LibRadosIoEC, WriteFullRoundTrip) { + SKIP_IF_CRIMSON(); char buf[128]; char buf2[64]; char buf3[128]; @@ -330,6 +334,7 @@ TEST_F(LibRadosIoEC, WriteFullRoundTrip) { } TEST_F(LibRadosIoEC, AppendRoundTrip) { + SKIP_IF_CRIMSON(); char *buf = (char *)new char[alignment]; char *buf2 = (char *)new char[alignment]; char *buf3 = (char *)new char[alignment *2]; @@ -358,6 +363,7 @@ TEST_F(LibRadosIoEC, AppendRoundTrip) { } TEST_F(LibRadosIoEC, TruncTest) { + SKIP_IF_CRIMSON(); char buf[128]; char buf2[sizeof(buf)]; memset(buf, 0xaa, sizeof(buf)); @@ -373,6 +379,7 @@ TEST_F(LibRadosIoEC, TruncTest) { } TEST_F(LibRadosIoEC, RemoveTest) { + SKIP_IF_CRIMSON(); char buf[128]; char buf2[sizeof(buf)]; memset(buf, 0xaa, sizeof(buf)); @@ -383,6 +390,7 @@ TEST_F(LibRadosIoEC, RemoveTest) { } TEST_F(LibRadosIoEC, XattrsRoundTrip) { + SKIP_IF_CRIMSON(); char buf[128]; char attr1[] = "attr1"; char attr1_buf[] = "foo bar baz"; @@ -396,6 +404,7 @@ TEST_F(LibRadosIoEC, XattrsRoundTrip) { } TEST_F(LibRadosIoEC, RmXattr) { + SKIP_IF_CRIMSON(); char buf[128]; char attr1[] = "attr1"; char attr1_buf[] = "foo bar baz"; @@ -419,6 +428,7 @@ TEST_F(LibRadosIoEC, RmXattr) { } TEST_F(LibRadosIoEC, XattrIter) { + SKIP_IF_CRIMSON(); char buf[128]; char attr1[] = "attr1"; char attr1_buf[] = "foo bar baz"; -- 2.47.3