From 1496051af686320b268944d8f83fc849883ab774 Mon Sep 17 00:00:00 2001
From: Kautilya Tripathi <kautilya.tripathi@ibm.com>
Date: Tue, 19 Aug 2025 18:28:46 +0530
Subject: [PATCH] test/librbd: Add SKIP_IF_CRIMSON for failing tests

Since now crimson has all tests enabled some still fails. This skips
them and adds a dedicated tracker for the same.

Co-authored-by: Matan Breizman <mbreizma@redhat.com>
Signed-off-by: Kautilya Tripathi <kautilya.tripathi@ibm.com>
---
 src/test/librbd/test_DeepCopy.cc  | 7 ++++---
 src/test/librbd/test_Migration.cc | 9 +++++++++
 src/test/librbd/test_internal.cc  | 5 +----
 src/test/librbd/test_librbd.cc    | 3 ---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/test/librbd/test_DeepCopy.cc b/src/test/librbd/test_DeepCopy.cc
index 457f958e68a22..5d25535fab445 100644
--- a/src/test/librbd/test_DeepCopy.cc
+++ b/src/test/librbd/test_DeepCopy.cc
@@ -510,12 +510,13 @@ TEST_F(TestDeepCopy, CloneFlatten)
 
 TEST_F(TestDeepCopy, Stress)
 {
+  // https://tracker.ceph.com/issues/72042
+  SKIP_IF_CRIMSON();
   test_stress();
 }
 
 TEST_F(TestDeepCopy, NoSnaps_LargerDstObjSize)
 {
-  SKIP_IF_CRIMSON();
   uint64_t order = m_src_ictx->order + 1;
   ASSERT_EQ(0, m_opts.set(RBD_IMAGE_OPTION_ORDER, order));
 
@@ -524,7 +525,6 @@ TEST_F(TestDeepCopy, NoSnaps_LargerDstObjSize)
 
 TEST_F(TestDeepCopy, Snaps_LargerDstObjSize)
 {
-  SKIP_IF_CRIMSON();
   uint64_t order = m_src_ictx->order + 1;
   ASSERT_EQ(0, m_opts.set(RBD_IMAGE_OPTION_ORDER, order));
 
@@ -555,7 +555,6 @@ TEST_F(TestDeepCopy, CloneFlatten_LargerDstObjSize)
 
 TEST_F(TestDeepCopy, Stress_LargerDstObjSize)
 {
-  SKIP_IF_CRIMSON();
   uint64_t order = m_src_ictx->order + 1 + rand() % 2;
   ASSERT_EQ(0, m_opts.set(RBD_IMAGE_OPTION_ORDER, order));
 
@@ -610,6 +609,8 @@ TEST_F(TestDeepCopy, CloneFlatten_SmallerDstObjSize)
 
 TEST_F(TestDeepCopy, Stress_SmallerDstObjSize)
 {
+  // https://tracker.ceph.com/issues/72042
+  SKIP_IF_CRIMSON();
   uint64_t order = m_src_ictx->order - 1 - rand() % 2;
   ASSERT_EQ(0, m_opts.set(RBD_IMAGE_OPTION_ORDER, order));
   uint64_t stripe_unit = m_src_ictx->stripe_unit >> 2;
diff --git a/src/test/librbd/test_Migration.cc b/src/test/librbd/test_Migration.cc
index e094d2e7e5265..b3ee324357931 100644
--- a/src/test/librbd/test_Migration.cc
+++ b/src/test/librbd/test_Migration.cc
@@ -4,6 +4,7 @@
 #include "test/librados/test.h"
 #include "test/librbd/test_fixture.h"
 #include "test/librbd/test_support.h"
+#include "test/librados/crimson_utils.h"
 #include "librbd/ImageState.h"
 #include "librbd/Operations.h"
 #include "librbd/api/Group.h"
@@ -1102,6 +1103,8 @@ TEST_F(TestMigration, CloneFlatten)
 
 TEST_F(TestMigration, TriggerAssertSnapcSeq)
 {
+  // https://tracker.ceph.com/issues/72041
+  SKIP_IF_CRIMSON();
   auto size = m_ictx->size;
 
   write((size >> 1) + 0, 10, 'A');
@@ -1162,6 +1165,8 @@ TEST_F(TestMigration, AbortWithoutSnapshots) {
 }
 
 TEST_F(TestMigration, AbortWithSnapshots) {
+  // https://tracker.ceph.com/issues/72650
+  SKIP_IF_CRIMSON();
   test_snaps();
   migration_prepare(m_ioctx, m_image_name);
   migration_status(RBD_IMAGE_MIGRATION_STATE_PREPARED);
@@ -1385,11 +1390,15 @@ TEST_F(TestMigration, Stress)
 
 TEST_F(TestMigration, Stress2)
 {
+  // https://tracker.ceph.com/issues/72705
+  SKIP_IF_CRIMSON();
   test_stress2(false);
 }
 
 TEST_F(TestMigration, StressLive)
 {
+  // https://tracker.ceph.com/issues/72709
+  SKIP_IF_CRIMSON();
   test_stress2(true);
 }
 
diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc
index 262557244229d..29be2713ac012 100644
--- a/src/test/librbd/test_internal.cc
+++ b/src/test/librbd/test_internal.cc
@@ -380,7 +380,6 @@ TEST_F(TestInternal, FlattenFailsToLockImage) {
 }
 
 TEST_F(TestInternal, WriteFailsToLockImageBlocklisted) {
-  SKIP_IF_CRIMSON();
   REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
 
   librados::Rados blocklist_rados;
@@ -414,7 +413,6 @@ TEST_F(TestInternal, WriteFailsToLockImageBlocklisted) {
 }
 
 TEST_F(TestInternal, WriteFailsToLockImageBlocklistedWatch) {
-  SKIP_IF_CRIMSON();
   REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
 
   librados::Rados blocklist_rados;
@@ -658,8 +656,7 @@ TEST_F(TestInternal, MetadataConfApply) {
 
 TEST_F(TestInternal, SnapshotCopyup)
 {
-  //https://tracker.ceph.com/issues/58263
-  // Clone overlap is WIP
+  // https://tracker.ceph.com/issues/72727
   SKIP_IF_CRIMSON();
   REQUIRE_FEATURE(RBD_FEATURE_LAYERING);
 
diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index 1feac8da7d299..68e6be42d3715 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -11373,7 +11373,6 @@ TEST_F(TestLibRBD, ExclusiveLock)
 
 TEST_F(TestLibRBD, BreakLock)
 {
-  SKIP_IF_CRIMSON();
   REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
   REQUIRE(!is_rbd_pwl_enabled((CephContext *)_rados.cct()));
 
@@ -12935,7 +12934,6 @@ TEST_F(TestLibRBD, QuiesceWatchPP)
 
 TEST_F(TestLibRBD, QuiesceWatchError)
 {
-  SKIP_IF_CRIMSON();
   librbd::RBD rbd;
   librados::IoCtx ioctx;
   ASSERT_EQ(0, _rados.ioctx_create(m_pool_name.c_str(), ioctx));
@@ -13294,7 +13292,6 @@ TEST_F(TestLibRBD, WriteZeroesThickProvision) {
 
 TEST_F(TestLibRBD, ConcurrentOperations)
 {
-  SKIP_IF_CRIMSON();
   REQUIRE_FEATURE(RBD_FEATURE_EXCLUSIVE_LOCK);
 
   librbd::RBD rbd;
-- 
2.39.5