You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2025/04/29 12:47:57 UTC

(ignite-3) branch main updated: IGNITE-24338 Support HA trigger for the Colocation track (#5716)

This is an automated email from the ASF dual-hosted git repository.

sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 5f6045dea3b IGNITE-24338 Support HA trigger for the Colocation track (#5716)
5f6045dea3b is described below

commit 5f6045dea3b62e84ce439450d29a46843bd72919
Author: Mirza Aliev <al...@gmail.com>
AuthorDate: Tue Apr 29 16:47:52 2025 +0400

    IGNITE-24338 Support HA trigger for the Colocation track (#5716)
---
 .../DistributionZonesTestUtil.java                 | 48 ++++++++++++
 ...bstractHighAvailablePartitionsRecoveryTest.java | 91 +++++++++++++++-------
 .../disaster/DisasterRecoveryManager.java          | 58 ++++++++++++--
 modules/transactions/build.gradle                  |  1 +
 .../disaster/ItDisasterRecoveryManagerTest.java    |  1 -
 .../ItDisasterRecoveryReconfigurationTest.java     | 48 +-----------
 .../ItDisasterRecoveryResetPartitionsTest.java     |  4 -
 7 files changed, 167 insertions(+), 84 deletions(-)

diff --git a/modules/distribution-zones/src/testFixtures/java/org/apache/ignite/internal/distributionzones/DistributionZonesTestUtil.java b/modules/distribution-zones/src/testFixtures/java/org/apache/ignite/internal/distributionzones/DistributionZonesTestUtil.java
index f482f416594..5858f3de6ae 100644
--- a/modules/distribution-zones/src/testFixtures/java/org/apache/ignite/internal/distributionzones/DistributionZonesTestUtil.java
+++ b/modules/distribution-zones/src/testFixtures/java/org/apache/ignite/internal/distributionzones/DistributionZonesTestUtil.java
@@ -33,6 +33,7 @@ import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zoneScaleUpTimerKey;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zonesLogicalTopologyKey;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zonesLogicalTopologyVersionKey;
+import static org.apache.ignite.internal.lang.IgniteSystemProperties.enabledColocation;
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -64,12 +65,17 @@ import org.apache.ignite.internal.catalog.descriptors.ConsistencyMode;
 import org.apache.ignite.internal.cluster.management.topology.api.LogicalNode;
 import org.apache.ignite.internal.distributionzones.DataNodesHistory.DataNodesHistorySerializer;
 import org.apache.ignite.internal.distributionzones.DistributionZonesUtil.DataNodesHistoryContext;
+import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil;
+import org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.lang.ByteArray;
 import org.apache.ignite.internal.metastorage.Entry;
 import org.apache.ignite.internal.metastorage.MetaStorageManager;
 import org.apache.ignite.internal.metastorage.server.KeyValueStorage;
 import org.apache.ignite.internal.network.ClusterNodeImpl;
+import org.apache.ignite.internal.replicator.PartitionGroupId;
+import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.replicator.ZonePartitionId;
 import org.apache.ignite.internal.util.ByteUtils;
 import org.apache.ignite.network.ClusterNode;
 import org.apache.ignite.network.NetworkAddress;
@@ -757,4 +763,46 @@ public class DistributionZonesTestUtil {
     public static void setZoneAutoAdjustScaleUpToImmediate(CatalogManager catalogManager, String zoneName) {
         alterZone(catalogManager, zoneName, IMMEDIATE_TIMER_VALUE, null, null);
     }
+
+    /**
+     * Returns stable partition assignments key.
+     *
+     * @param partitionGroupId Partition group identifier.
+     * @return Stable partition assignments key.
+     */
+    public static ByteArray stablePartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
+        if (enabledColocation()) {
+            return ZoneRebalanceUtil.stablePartAssignmentsKey((ZonePartitionId) partitionGroupId);
+        } else {
+            return RebalanceUtil.stablePartAssignmentsKey((TablePartitionId) partitionGroupId);
+        }
+    }
+
+    /**
+     * Returns pending partition assignments key.
+     *
+     * @param partitionGroupId Partition group identifier.
+     * @return Pending partition assignments key.
+     */
+    public static ByteArray pendingPartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
+        if (enabledColocation()) {
+            return ZoneRebalanceUtil.pendingPartAssignmentsQueueKey((ZonePartitionId) partitionGroupId);
+        } else {
+            return RebalanceUtil.pendingPartAssignmentsQueueKey((TablePartitionId) partitionGroupId);
+        }
+    }
+
+    /**
+     * Returns planned partition assignments key.
+     *
+     * @param partitionGroupId Partition group identifier.
+     * @return Planned partition assignments key.
+     */
+    public static ByteArray plannedPartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
+        if (enabledColocation()) {
+            return ZoneRebalanceUtil.plannedPartAssignmentsKey((ZonePartitionId) partitionGroupId);
+        } else {
+            return RebalanceUtil.plannedPartAssignmentsKey((TablePartitionId) partitionGroupId);
+        }
+    }
 }
diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/AbstractHighAvailablePartitionsRecoveryTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/AbstractHighAvailablePartitionsRecoveryTest.java
index 5b75c7c091b..a8c99b9a695 100644
--- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/AbstractHighAvailablePartitionsRecoveryTest.java
+++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/AbstractHighAvailablePartitionsRecoveryTest.java
@@ -24,14 +24,13 @@ import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl;
 import static org.apache.ignite.internal.TestWrappers.unwrapTableManager;
 import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_FILTER;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.pendingPartitionAssignmentsKey;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.plannedPartitionAssignmentsKey;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.stablePartitionAssignmentsKey;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.PARTITION_DISTRIBUTION_RESET_TIMEOUT;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zoneDataNodesHistoryKey;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zoneScaleDownTimerKey;
-import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.pendingPartAssignmentsQueueKey;
-import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.plannedPartAssignmentsKey;
-import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.stablePartAssignmentsKey;
 import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.stablePartitionAssignments;
-import static org.apache.ignite.internal.lang.IgniteSystemProperties.COLOCATION_FEATURE_FLAG;
 import static org.apache.ignite.internal.lang.IgniteSystemProperties.enabledColocation;
 import static org.apache.ignite.internal.table.TableTestUtils.getTableId;
 import static org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager.RECOVERY_TRIGGER_KEY;
@@ -55,7 +54,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -90,6 +88,7 @@ import org.apache.ignite.internal.partitiondistribution.Assignment;
 import org.apache.ignite.internal.partitiondistribution.Assignments;
 import org.apache.ignite.internal.partitiondistribution.AssignmentsQueue;
 import org.apache.ignite.internal.raft.RaftNodeId;
+import org.apache.ignite.internal.replicator.PartitionGroupId;
 import org.apache.ignite.internal.replicator.TablePartitionId;
 import org.apache.ignite.internal.replicator.ZonePartitionId;
 import org.apache.ignite.internal.schema.BinaryRow;
@@ -104,7 +103,6 @@ import org.apache.ignite.internal.table.TableImpl;
 import org.apache.ignite.internal.table.TableTestUtils;
 import org.apache.ignite.internal.table.TableViewInternal;
 import org.apache.ignite.internal.table.distributed.TableManager;
-import org.apache.ignite.internal.testframework.WithSystemProperty;
 import org.apache.ignite.internal.util.ExceptionUtils;
 import org.apache.ignite.internal.versioned.VersionedSerialization;
 import org.apache.ignite.lang.ErrorGroups.Replicator;
@@ -116,8 +114,6 @@ import org.apache.ignite.table.Tuple;
 import org.apache.ignite.tx.TransactionException;
 
 /** Parent for tests of HA zones feature. */
-// TODO https://issues.apache.org/jira/browse/IGNITE-24144
-@WithSystemProperty(key = COLOCATION_FEATURE_FLAG, value = "false")
 public abstract class AbstractHighAvailablePartitionsRecoveryTest extends ClusterPerTestIntegrationTest {
     static final String SCHEMA_NAME = SqlCommon.DEFAULT_SCHEMA_NAME;
 
@@ -155,8 +151,13 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
         int zoneId = catalog.zone(zoneName).id();
         int tableId = catalog.table(SCHEMA_NAME, tableName).id();
 
+        if (enabledColocation()) {
+            assertEquals(of(zoneId, PARTITION_IDS), request.partitionIds());
+        } else {
+            assertEquals(of(tableId, PARTITION_IDS), request.partitionIds());
+        }
+
         assertEquals(zoneId, request.zoneId());
-        assertEquals(of(tableId, PARTITION_IDS), request.partitionIds());
         assertFalse(request.manualUpdate());
     }
 
@@ -258,11 +259,23 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
 
                             assert tableId != null;
 
-                            TablePartitionId tablePartitionId = new TablePartitionId(tableId, partNum);
+                            int zoneId = TableTestUtils.getZoneIdByTableNameStrict(
+                                    gatewayNode.catalogManager(),
+                                    tableName,
+                                    clock.nowLong()
+                            );
+
+                            PartitionGroupId replicationGroupId;
 
-                            ByteArray stableKey = stablePartAssignmentsKey(tablePartitionId);
-                            ByteArray pendingKey = pendingPartAssignmentsQueueKey(tablePartitionId);
-                            ByteArray plannedKey = plannedPartAssignmentsKey(tablePartitionId);
+                            if (enabledColocation()) {
+                                replicationGroupId = new ZonePartitionId(zoneId, partNum);
+                            } else {
+                                replicationGroupId = new TablePartitionId(tableId, partNum);
+                            }
+
+                            ByteArray stableKey = stablePartitionAssignmentsKey(replicationGroupId);
+                            ByteArray pendingKey = pendingPartitionAssignmentsKey(replicationGroupId);
+                            ByteArray plannedKey = plannedPartitionAssignmentsKey(replicationGroupId);
 
                             Map<ByteArray, Entry> results = await(gatewayNode.metaStorageManager()
                                     .getAll(Set.of(stableKey, pendingKey, plannedKey)), 1, TimeUnit.SECONDS);
@@ -311,11 +324,13 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
     private Set<Assignment> getPartitionClusterNodes(IgniteImpl node, String tableName, int partNum) {
         if (enabledColocation()) {
             int zoneId = TableTestUtils.getZoneIdByTableNameStrict(node.catalogManager(), tableName, clock.nowLong());
-            try {
-                return ZoneRebalanceUtil.zonePartitionAssignments(node.metaStorageManager(), zoneId, partNum).get();
-            } catch (InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
-            }
+
+            CompletableFuture<Set<Assignment>> zonePartAssignmentsFut =
+                    ZoneRebalanceUtil.zonePartitionAssignments(node.metaStorageManager(), zoneId, partNum);
+
+            assertThat(zonePartAssignmentsFut, willCompleteSuccessfully());
+
+            return zonePartAssignmentsFut.join();
         } else {
             return getTablePartitionClusterNodes(node, tableName, partNum);
         }
@@ -358,11 +373,15 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
 
         int zoneId = DistributionZonesTestUtil.getZoneId(igniteImpl(0).catalogManager(), zoneName, clock.nowLong());
 
-        awaitForAllNodesTableGroupInitialization(zoneId, tableIds, targetNodes.size());
-
-        tableNames.forEach(t ->
-                waitAndAssertStableAssignmentsOfPartitionEqualTo(unwrapIgniteImpl(node(0)), t, PARTITION_IDS, targetNodes)
-        );
+        if (enabledColocation()) {
+            awaitForAllNodesZoneGroupInitialization(zoneId, targetNodes.size());
+            waitAndAssertStableAssignmentsOfPartitionEqualTo(unwrapIgniteImpl(node(0)), tableNames.get(0), PARTITION_IDS, targetNodes);
+        } else {
+            awaitForAllNodesTableGroupInitialization(tableIds, targetNodes.size());
+            tableNames.forEach(t ->
+                    waitAndAssertStableAssignmentsOfPartitionEqualTo(unwrapIgniteImpl(node(0)), t, PARTITION_IDS, targetNodes)
+            );
+        }
     }
 
     final void createHaZoneWithTables(String zoneName, List<String> tableNames) throws InterruptedException {
@@ -483,7 +502,7 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
         return gatewayNode.metaStorageManager().appliedRevision();
     }
 
-    private void awaitForAllNodesTableGroupInitialization(int zoneId, Set<Integer> tableIds, int replicas) throws InterruptedException {
+    private void awaitForAllNodesTableGroupInitialization(Set<Integer> tableIds, int replicas) throws InterruptedException {
         assertTrue(waitForCondition(() -> {
             AtomicInteger numberOfInitializedReplicas = new AtomicInteger(0);
 
@@ -494,9 +513,6 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
                     if (raftNodeId.groupId() instanceof TablePartitionId
                             && tableIds.contains(((TablePartitionId) raftNodeId.groupId()).tableId())) {
                         incrementReplicaCountIfHasLog(raftNodeId, igniteImpl, numberOfInitializedReplicas);
-                    } else if (raftNodeId.groupId() instanceof ZonePartitionId
-                            && zoneId == ((ZonePartitionId) raftNodeId.groupId()).zoneId()) {
-                        incrementReplicaCountIfHasLog(raftNodeId, igniteImpl, numberOfInitializedReplicas);
                     }
                 });
 
@@ -506,6 +522,27 @@ public abstract class AbstractHighAvailablePartitionsRecoveryTest extends Cluste
         }, 10_000));
     }
 
+    private void awaitForAllNodesZoneGroupInitialization(int zoneId, int replicas) throws InterruptedException {
+        assertTrue(waitForCondition(() -> {
+            AtomicInteger numberOfInitializedReplicas = new AtomicInteger(0);
+
+            runningNodes().forEach(ignite -> {
+                IgniteImpl igniteImpl = unwrapIgniteImpl(ignite);
+                igniteImpl.raftManager().localNodes().forEach((raftNodeId) -> {
+
+                    if (raftNodeId.groupId() instanceof ZonePartitionId
+                            && zoneId == ((ZonePartitionId) raftNodeId.groupId()).zoneId()
+                    ) {
+                        incrementReplicaCountIfHasLog(raftNodeId, igniteImpl, numberOfInitializedReplicas);
+                    }
+                });
+
+            });
+
+            return PARTITIONS_NUMBER * replicas == numberOfInitializedReplicas.get();
+        }, 10_000));
+    }
+
     private static void incrementReplicaCountIfHasLog(
             RaftNodeId raftNodeId,
             IgniteImpl igniteImpl,
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
index 399c4f8efd9..5c9c5c3f0b2 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
@@ -27,8 +27,8 @@ import static java.util.stream.Collectors.toSet;
 import static org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_CREATE;
 import static org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_DROP;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.findTablesByZoneId;
-import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.stablePartAssignmentsKey;
 import static org.apache.ignite.internal.event.EventListener.fromConsumer;
+import static org.apache.ignite.internal.lang.IgniteSystemProperties.enabledColocation;
 import static org.apache.ignite.internal.metastorage.dsl.Conditions.notExists;
 import static org.apache.ignite.internal.metastorage.dsl.Conditions.value;
 import static org.apache.ignite.internal.metastorage.dsl.Operations.put;
@@ -75,6 +75,8 @@ import org.apache.ignite.internal.distributionzones.NodeWithAttributes;
 import org.apache.ignite.internal.distributionzones.events.HaZoneTopologyUpdateEvent;
 import org.apache.ignite.internal.distributionzones.events.HaZoneTopologyUpdateEventParams;
 import org.apache.ignite.internal.distributionzones.exception.DistributionZoneNotFoundException;
+import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil;
+import org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil;
 import org.apache.ignite.internal.failure.FailureContext;
 import org.apache.ignite.internal.failure.FailureManager;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
@@ -242,7 +244,11 @@ public class DisasterRecoveryManager implements IgniteComponent, SystemViewProvi
 
         metaStorageManager.registerExactWatch(RECOVERY_TRIGGER_KEY, watchListener);
 
-        dzManager.listen(HaZoneTopologyUpdateEvent.TOPOLOGY_REDUCED, this::onHaZoneTopologyReduce);
+        if (!enabledColocation()) {
+            dzManager.listen(HaZoneTopologyUpdateEvent.TOPOLOGY_REDUCED, this::onHaZoneTablePartitionTopologyReduce);
+        } else {
+            dzManager.listen(HaZoneTopologyUpdateEvent.TOPOLOGY_REDUCED, this::onHaZonePartitionTopologyReduce);
+        }
 
         catalogManager.listen(TABLE_CREATE, fromConsumer(this::onTableCreate));
 
@@ -277,7 +283,7 @@ public class DisasterRecoveryManager implements IgniteComponent, SystemViewProvi
         return ongoingOperationsById;
     }
 
-    private CompletableFuture<Boolean> onHaZoneTopologyReduce(HaZoneTopologyUpdateEventParams params) {
+    private CompletableFuture<Boolean> onHaZoneTablePartitionTopologyReduce(HaZoneTopologyUpdateEventParams params) {
         int zoneId = params.zoneId();
         long revision = params.causalityToken();
         long timestamp = metaStorageManager.timestampByRevisionLocally(revision).longValue();
@@ -292,7 +298,7 @@ public class DisasterRecoveryManager implements IgniteComponent, SystemViewProvi
             for (int partId = 0; partId < zoneDescriptor.partitions(); partId++) {
                 TablePartitionId partitionId = new TablePartitionId(table.id(), partId);
 
-                if (stableAssignmentsWithOnlyAliveNodes(partitionId, revision).size() < calculateQuorum(zoneDescriptor.replicas())) {
+                if (stableAssignmentsWithOnlyAliveNodes(partitionId, revision, false).size() < calculateQuorum(zoneDescriptor.replicas())) {
                     partitionsToReset.add(partId);
                 }
             }
@@ -309,9 +315,47 @@ public class DisasterRecoveryManager implements IgniteComponent, SystemViewProvi
         }
     }
 
-    private Set<Assignment> stableAssignmentsWithOnlyAliveNodes(TablePartitionId partitionId, long revision) {
-        Set<Assignment> stableAssignments = Assignments.fromBytes(
-                metaStorageManager.getLocally(stablePartAssignmentsKey(partitionId), revision).value()).nodes();
+    private CompletableFuture<Boolean> onHaZonePartitionTopologyReduce(HaZoneTopologyUpdateEventParams params) {
+        int zoneId = params.zoneId();
+        long revision = params.causalityToken();
+        long timestamp = metaStorageManager.timestampByRevisionLocally(revision).longValue();
+
+        Catalog catalog = catalogManager.activeCatalog(timestamp);
+        CatalogZoneDescriptor zoneDescriptor = catalog.zone(zoneId);
+
+        Set<Integer> partitionsToReset = new HashSet<>();
+
+        for (int partId = 0; partId < zoneDescriptor.partitions(); partId++) {
+            ZonePartitionId partitionId = new ZonePartitionId(zoneId, partId);
+
+            if (stableAssignmentsWithOnlyAliveNodes(partitionId, revision, true).size() < calculateQuorum(zoneDescriptor.replicas())) {
+                partitionsToReset.add(partId);
+            }
+        }
+
+        if (!partitionsToReset.isEmpty()) {
+            return resetPartitions(zoneDescriptor.name(), Map.of(zoneId, partitionsToReset), false, revision, true).thenApply(r -> false);
+        } else {
+            return falseCompletedFuture();
+        }
+    }
+
+    private Set<Assignment> stableAssignmentsWithOnlyAliveNodes(ReplicationGroupId partitionId, long revision, boolean colocationEnabled) {
+        Set<Assignment> stableAssignments;
+
+        if (colocationEnabled) {
+            stableAssignments = ZoneRebalanceUtil.zoneStableAssignmentsGetLocally(
+                    metaStorageManager,
+                    (ZonePartitionId) partitionId,
+                    revision
+            ).nodes();
+        } else {
+            stableAssignments = RebalanceUtil.stableAssignmentsGetLocally(
+                    metaStorageManager,
+                    (TablePartitionId) partitionId,
+                    revision
+            ).nodes();
+        }
 
         Set<String> logicalTopology = dzManager.logicalTopology(revision)
                 .stream().map(NodeWithAttributes::nodeName).collect(Collectors.toUnmodifiableSet());
diff --git a/modules/transactions/build.gradle b/modules/transactions/build.gradle
index 2ae10e27a60..855d3042d98 100644
--- a/modules/transactions/build.gradle
+++ b/modules/transactions/build.gradle
@@ -89,6 +89,7 @@ dependencies {
     integrationTestImplementation project(':ignite-client-handler')
     integrationTestImplementation libs.jetbrains.annotations
     integrationTestImplementation(testFixtures(project(':ignite-core')))
+    integrationTestImplementation(testFixtures(project(':ignite-distribution-zones')))
     integrationTestImplementation(testFixtures(project(':ignite-transactions')))
     integrationTestImplementation(testFixtures(project(':ignite-table')))
     integrationTestImplementation(testFixtures(project(':ignite-sql-engine')))
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
index 1ba08cdcb92..5a8d56c6c05 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryManagerTest.java
@@ -64,7 +64,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
 /** For {@link DisasterRecoveryManager} integration testing. */
-@WithSystemProperty(key = COLOCATION_FEATURE_FLAG, value = "false")
 // TODO https://issues.apache.org/jira/browse/IGNITE-22332 Add test cases.
 public class ItDisasterRecoveryManagerTest extends ClusterPerTestIntegrationTest {
     /** Table name. */
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryReconfigurationTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryReconfigurationTest.java
index c17b61c8aff..b46bb7815df 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryReconfigurationTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryReconfigurationTest.java
@@ -27,6 +27,9 @@ import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl;
 import static org.apache.ignite.internal.TestWrappers.unwrapTableManager;
 import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.pendingPartitionAssignmentsKey;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.plannedPartitionAssignmentsKey;
+import static org.apache.ignite.internal.distributionzones.DistributionZonesTestUtil.stablePartitionAssignmentsKey;
 import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.PARTITION_DISTRIBUTION_RESET_TIMEOUT;
 import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.assignmentsChainKey;
 import static org.apache.ignite.internal.lang.IgniteSystemProperties.COLOCATION_FEATURE_FLAG;
@@ -80,8 +83,6 @@ import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.ConsistencyMode;
 import org.apache.ignite.internal.configuration.SystemDistributedExtensionConfiguration;
 import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
-import org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil;
-import org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.lang.ByteArray;
 import org.apache.ignite.internal.lang.RunnableX;
@@ -2116,47 +2117,4 @@ public class ItDisasterRecoveryReconfigurationTest extends ClusterPerTestIntegra
 
         ConsistencyMode consistencyMode() default ConsistencyMode.STRONG_CONSISTENCY;
     }
-
-
-    /**
-     * Returns stable partition assignments key.
-     *
-     * @param partitionGroupId Partition group identifier.
-     * @return Stable partition assignments key.
-     */
-    public static ByteArray stablePartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
-        if (enabledColocation()) {
-            return ZoneRebalanceUtil.stablePartAssignmentsKey((ZonePartitionId) partitionGroupId);
-        } else {
-            return RebalanceUtil.stablePartAssignmentsKey((TablePartitionId) partitionGroupId);
-        }
-    }
-
-    /**
-     * Returns pending partition assignments key.
-     *
-     * @param partitionGroupId Partition group identifier.
-     * @return Pending partition assignments key.
-     */
-    public static ByteArray pendingPartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
-        if (enabledColocation()) {
-            return ZoneRebalanceUtil.pendingPartAssignmentsQueueKey((ZonePartitionId) partitionGroupId);
-        } else {
-            return RebalanceUtil.pendingPartAssignmentsQueueKey((TablePartitionId) partitionGroupId);
-        }
-    }
-
-    /**
-     * Returns planned partition assignments key.
-     *
-     * @param partitionGroupId Partition group identifier.
-     * @return Planned partition assignments key.
-     */
-    public static ByteArray plannedPartitionAssignmentsKey(PartitionGroupId partitionGroupId) {
-        if (enabledColocation()) {
-            return ZoneRebalanceUtil.plannedPartAssignmentsKey((ZonePartitionId) partitionGroupId);
-        } else {
-            return RebalanceUtil.plannedPartAssignmentsKey((TablePartitionId) partitionGroupId);
-        }
-    }
 }
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryResetPartitionsTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryResetPartitionsTest.java
index d46fa981eae..8073d75d7f3 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryResetPartitionsTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryResetPartitionsTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.disaster;
 import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
 import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal;
 import static org.apache.ignite.internal.catalog.CatalogManagerImpl.DEFAULT_ZONE_NAME;
-import static org.apache.ignite.internal.lang.IgniteSystemProperties.COLOCATION_FEATURE_FLAG;
 import static org.apache.ignite.internal.lang.IgniteSystemProperties.enabledColocation;
 import static org.apache.ignite.internal.sql.SqlCommon.DEFAULT_SCHEMA_NAME;
 import static org.apache.ignite.internal.testframework.IgniteTestUtils.assertThrows;
@@ -47,14 +46,11 @@ import org.apache.ignite.internal.metastorage.Entry;
 import org.apache.ignite.internal.partitiondistribution.Assignments;
 import org.apache.ignite.internal.table.distributed.disaster.DisasterRecoveryManager;
 import org.apache.ignite.internal.table.distributed.disaster.TestDisasterRecoveryUtils;
-import org.apache.ignite.internal.testframework.WithSystemProperty;
 import org.apache.ignite.sql.SqlException;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 /** Tests for disaster recovery manager reset partition command. */
-// TODO https://issues.apache.org/jira/browse/IGNITE-24338
-@WithSystemProperty(key = COLOCATION_FEATURE_FLAG, value = "false")
 public class ItDisasterRecoveryResetPartitionsTest extends ClusterPerTestIntegrationTest {
     private static final String TABLE_NAME = "PERSON";