Extend Region & Remove Region & Reconstruct Region (#14634)

* save * it works * fxxk it * add files * merge master & save, need to do submit procedure * basically done * rename RegionMemberChangeProcedure to RegionOperationProcedure * move function & files * add IT * add reconstruct IT * spotless * fix IT * spotless * Tan review * use leader as coordinator & fix IT
apache · Jan 17, 2025 · 141b7ba · 141b7ba
1 parent 49a91ec
commit 141b7ba
Show file tree

Hide file tree

Showing 60 changed files with 1,896 additions and 325 deletions.
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java b/integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java
@@ -20,6 +20,7 @@
 package org.apache.iotdb.it.env;
 
 import org.apache.iotdb.it.env.cluster.env.AIEnv;
+import org.apache.iotdb.it.env.cluster.env.AbstractEnv;
 import org.apache.iotdb.it.env.cluster.env.Cluster1Env;
 import org.apache.iotdb.it.env.cluster.env.SimpleEnv;
 import org.apache.iotdb.it.env.remote.env.RemoteServerEnv;
@@ -75,4 +76,8 @@ public static BaseEnv getEnv() {
     }
     return env;
   }
+
+  public static AbstractEnv getAbstractEnv() {
+    return (AbstractEnv) getEnv();
+  }
 }
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java
@@ -330,6 +330,10 @@ private Map<String, Integer> countNodeStatus(final Map<Integer, String> nodeStat
     return result;
   }
 
+  public void checkNodeInStatus(int nodeId, NodeStatus expectation) {
+    checkClusterStatus(nodeStatusMap -> expectation.getStatus().equals(nodeStatusMap.get(nodeId)));
+  }
+
   public void checkClusterStatusWithoutUnknown() {
     checkClusterStatus(
         nodeStatusMap -> nodeStatusMap.values().stream().noneMatch("Unknown"::equals));

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AINodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AINodeWrapper.java
@@ -90,6 +90,11 @@ public String getLogDirPath() {
         + getTimeForLogDirectory(startTime);
   }
 
+  @Override
+  String getNodeType() {
+    return "ainode";
+  }
+
   @Override
   public void start() {
     try {

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java
@@ -630,6 +630,18 @@ public String getNodePath() {
     return System.getProperty(USER_DIR) + File.separator + TARGET + File.separator + getId();
   }
 
+  public String getDataPath() {
+    return getNodePath()
+        + File.separator
+        + IoTDBConstant.DATA_FOLDER_NAME
+        + File.separator
+        + getNodeType()
+        + File.separator
+        + IoTDBConstant.DATA_FOLDER_NAME;
+  }
+
+  abstract String getNodeType();
+
   public void dumpJVMSnapshot(String testCaseName) {
     JMXServiceURL url;
     try {

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/ConfigNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/ConfigNodeWrapper.java
@@ -139,6 +139,11 @@ protected void addStartCmdParams(final List<String> params) {
             "-s"));
   }
 
+  @Override
+  String getNodeType() {
+    return "confignode";
+  }
+
   @Override
   protected void reloadMutableFields() {
     mutableCommonProperties.setProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS, SIMPLE_CONSENSUS);

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java
@@ -175,6 +175,11 @@ protected void addStartCmdParams(final List<String> params) {
             "-s"));
   }
 
+  @Override
+  String getNodeType() {
+    return "datanode";
+  }
+
   @Override
   protected void reloadMutableFields() {
     mutableCommonProperties.setProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS, SIMPLE_CONSENSUS);

diff --git a/...tdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV1.java b/...tdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV1.java
@@ -26,7 +26,7 @@
 import org.junit.Before;
 
 public class IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV1
-    extends IoTDBRegionMigrateReliabilityITFramework {
+    extends IoTDBRegionOperationReliabilityITFramework {
 
   @Override
   @Before

diff --git a/...tdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2.java b/...tdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2.java
@@ -22,7 +22,7 @@
 import org.apache.iotdb.commons.utils.KillPoint.KillNode;
 
 public class IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2
-    extends IoTDBRegionMigrateReliabilityITFramework {
+    extends IoTDBRegionOperationReliabilityITFramework {
 
   @SafeVarargs
   public final <T extends Enum<T>> void success(T... dataNodeKillPoints) throws Exception {