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

CRZbulabula pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ab38d1f90f Retry inconsistent region metadata while waiting for 
migrations (#19163)
3ab38d1f90f is described below

commit 3ab38d1f90fda0601a8a33962427cae0e9cbf8c2
Author: d-wang-commit <[email protected]>
AuthorDate: Fri Nov 6 15:45:25 2026 +0800

    Retry inconsistent region metadata while waiting for migrations (#19163)
    
    Treat transient cross-node SHOW REGIONS mismatches as unmet conditions
    in migration waits while preserving their deadlines and final assertions.
---
 .../it/regionmigration/pass/commit/RegionMigrateFileAssertions.java    | 3 +++
 .../pass/commit/stream/IoTDBRegionMigrateNormalForIoTV2StreamIT.java   | 3 +++
 .../pass/daily/iotv1/IoTDBRegionMigrateWithCompressionRatioIT.java     | 3 +++
 .../pass/daily/iotv1/IoTDBRegionMigrateWithLastEmptyDeletionIT.java    | 3 +++
 4 files changed, 12 insertions(+)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/RegionMigrateFileAssertions.java
 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/RegionMigrateFileAssertions.java
index 0dff2731f42..8b4909fd8b7 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/RegionMigrateFileAssertions.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/RegionMigrateFileAssertions.java
@@ -21,6 +21,7 @@ package 
org.apache.iotdb.confignode.it.regionmigration.pass.commit;
 
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
+import org.apache.iotdb.itbase.exception.InconsistentDataException;
 
 import org.awaitility.Awaitility;
 import org.junit.Assert;
@@ -67,8 +68,10 @@ final class RegionMigrateFileAssertions {
 
   static void awaitRegionReplicas(
       Statement statement, int dataRegionId, Set<Integer> 
expectedReplicaDataNodeIds) {
+    // Parallel SHOW REGIONS queries can observe different stages of the 
migration.
     Awaitility.await()
         .atMost(10, TimeUnit.MINUTES)
+        .ignoreException(InconsistentDataException.class)
         .pollDelay(1, TimeUnit.SECONDS)
         .pollInterval(2, TimeUnit.SECONDS)
         .untilAsserted(
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalForIoTV2StreamIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalForIoTV2StreamIT.java
index 588ac0615e1..9edf9f5dbfd 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalForIoTV2StreamIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalForIoTV2StreamIT.java
@@ -27,6 +27,7 @@ import org.apache.iotdb.consensus.ConsensusFactory;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.ClusterIT;
+import org.apache.iotdb.itbase.exception.InconsistentDataException;
 import org.apache.iotdb.rpc.TSStatusCode;
 
 import org.awaitility.Awaitility;
@@ -115,8 +116,10 @@ public class IoTDBRegionMigrateNormalForIoTV2StreamIT
       Set<Integer> expectedDataNodes = new 
HashSet<>(regionMap.get(selectedRegion));
       expectedDataNodes.remove(source);
       expectedDataNodes.add(destination);
+      // Parallel SHOW REGIONS queries can observe different stages of the 
migration.
       Awaitility.await()
           .atMost(1, TimeUnit.MINUTES)
+          .ignoreException(InconsistentDataException.class)
           .untilAsserted(
               () ->
                   Assert.assertEquals(
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithCompressionRatioIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithCompressionRatioIT.java
index 1f4dff2b3d0..dfa885d34a3 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithCompressionRatioIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithCompressionRatioIT.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.consensus.ConsensusFactory;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.DailyIT;
+import org.apache.iotdb.itbase.exception.InconsistentDataException;
 
 import org.apache.tsfile.utils.Pair;
 import org.awaitility.Awaitility;
@@ -112,8 +113,10 @@ public class IoTDBRegionMigrateWithCompressionRatioIT {
               "migrate region %d from %d to %d", dataRegionIdForTest, 
leaderId, newLeaderId));
 
       double finalCompressionRatioBeforeMigration = 
compressionRatioBeforeMigration[0];
+      // Parallel SHOW REGIONS queries can observe different stages of the 
migration.
       Awaitility.await()
           .atMost(10, TimeUnit.MINUTES)
+          .ignoreException(InconsistentDataException.class)
           .pollDelay(1, TimeUnit.SECONDS)
           .untilAsserted(
               () -> {
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithLastEmptyDeletionIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithLastEmptyDeletionIT.java
index 8a81e1ec4ad..1a55c5aeed0 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithLastEmptyDeletionIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv1/IoTDBRegionMigrateWithLastEmptyDeletionIT.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.consensus.ConsensusFactory;
 import org.apache.iotdb.it.env.EnvFactory;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.DailyIT;
+import org.apache.iotdb.itbase.exception.InconsistentDataException;
 
 import org.apache.tsfile.utils.Pair;
 import org.awaitility.Awaitility;
@@ -90,8 +91,10 @@ public class IoTDBRegionMigrateWithLastEmptyDeletionIT {
           String.format(
               "migrate region %d from %d to %d", dataRegionIdForTest, 
leaderId, newLeaderId));
 
+      // Parallel SHOW REGIONS queries can observe different stages of the 
migration.
       Awaitility.await()
           .atMost(10, TimeUnit.MINUTES)
+          .ignoreException(InconsistentDataException.class)
           .pollDelay(1, TimeUnit.SECONDS)
           .until(
               () -> {

Reply via email to