Merge pull request ceph#65465 from knrt10/wip-kautilya-renable-testmigration

crimson/osd: fix assertion fail in prepare_clone

Reviewed-by: Ilya Dryomov <[email protected]>
Reviewed-by: Matan Breizman <[email protected]>

Author: Matan-B

src/crimson/osd/ops_executer.h

@@ -450,6 +450,19 @@ class OpsExecuter {
 
   version_t get_last_user_version() const;
 
+  bool has_cloning_ctx() const {
+    return cloning_ctx != nullptr;
+  }
+
+  const hobject_t& get_cloning_coid() const {
+    ceph_assert(has_cloning_ctx());
+    return cloning_ctx->coid;
+  }
+
+  void reset_cloning_ctx() {
+    cloning_ctx.reset();
+  }
+
   ObjectContextRef prepare_clone(
     const hobject_t& coid,
     const ObjectState& initial_obs);

src/crimson/osd/pg.cc

@@ -1155,8 +1155,19 @@ PG::run_executer_fut PG::run_executer(
 {
   LOG_PREFIX(PG::run_executer);
   auto rollbacker = ox.create_rollbacker(
-    [obc_data = duplicate_obc_data(obc)](auto &obc) mutable {
+    [FNAME, obc_data = duplicate_obc_data(obc), &ox, this](auto &obc) mutable {
+      // First, revert the OBC state
       obc->update_from(obc_data);
+      // Then clean up any prepared clone OBCs
+      if (ox.has_cloning_ctx()) {
+        const auto coid = ox.get_cloning_coid();
+        DEBUGDPP("cleaning up clone OBC for {} reqid={}",
+        FNAME, coid, ox.get_message().get_reqid());
+        // Use single-key clear by passing [coid, coid] to avoid impacting other clones
+        this->obc_registry.clear_range(coid, coid);
+        // Reset the cloning context directly
+        ox.reset_cloning_ctx();
+      }
     });
   auto rollback_on_error = seastar::defer([&rollbacker] {
     rollbacker.rollback_obc_if_modified();

src/test/librbd/test_DeepCopy.cc

@@ -510,8 +510,6 @@ TEST_F(TestDeepCopy, CloneFlatten)
 
 TEST_F(TestDeepCopy, Stress)
 {
-  // https://tracker.ceph.com/issues/72042
-  SKIP_IF_CRIMSON();
   test_stress();
 }
 
@@ -609,8 +607,6 @@ 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;

src/test/librbd/test_Migration.cc

@@ -1103,8 +1103,6 @@ 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');
@@ -1165,8 +1163,6 @@ 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);
@@ -1390,15 +1386,11 @@ 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);
 }