Skip to content

Commit 141b7ba

Browse files
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
1 parent 49a91ec commit 141b7ba

File tree

60 files changed

+1896
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1896
-325
lines changed

integration-test/src/main/java/org/apache/iotdb/it/env/EnvFactory.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.apache.iotdb.it.env;
2121

2222
import org.apache.iotdb.it.env.cluster.env.AIEnv;
23+
import org.apache.iotdb.it.env.cluster.env.AbstractEnv;
2324
import org.apache.iotdb.it.env.cluster.env.Cluster1Env;
2425
import org.apache.iotdb.it.env.cluster.env.SimpleEnv;
2526
import org.apache.iotdb.it.env.remote.env.RemoteServerEnv;
@@ -75,4 +76,8 @@ public static BaseEnv getEnv() {
7576
}
7677
return env;
7778
}
79+
80+
public static AbstractEnv getAbstractEnv() {
81+
return (AbstractEnv) getEnv();
82+
}
7883
}

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/env/AbstractEnv.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ private Map<String, Integer> countNodeStatus(final Map<Integer, String> nodeStat
330330
return result;
331331
}
332332

333+
public void checkNodeInStatus(int nodeId, NodeStatus expectation) {
334+
checkClusterStatus(nodeStatusMap -> expectation.getStatus().equals(nodeStatusMap.get(nodeId)));
335+
}
336+
333337
public void checkClusterStatusWithoutUnknown() {
334338
checkClusterStatus(
335339
nodeStatusMap -> nodeStatusMap.values().stream().noneMatch("Unknown"::equals));

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AINodeWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ public String getLogDirPath() {
9090
+ getTimeForLogDirectory(startTime);
9191
}
9292

93+
@Override
94+
String getNodeType() {
95+
return "ainode";
96+
}
97+
9398
@Override
9499
public void start() {
95100
try {

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,18 @@ public String getNodePath() {
630630
return System.getProperty(USER_DIR) + File.separator + TARGET + File.separator + getId();
631631
}
632632

633+
public String getDataPath() {
634+
return getNodePath()
635+
+ File.separator
636+
+ IoTDBConstant.DATA_FOLDER_NAME
637+
+ File.separator
638+
+ getNodeType()
639+
+ File.separator
640+
+ IoTDBConstant.DATA_FOLDER_NAME;
641+
}
642+
643+
abstract String getNodeType();
644+
633645
public void dumpJVMSnapshot(String testCaseName) {
634646
JMXServiceURL url;
635647
try {

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/ConfigNodeWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ protected void addStartCmdParams(final List<String> params) {
139139
"-s"));
140140
}
141141

142+
@Override
143+
String getNodeType() {
144+
return "confignode";
145+
}
146+
142147
@Override
143148
protected void reloadMutableFields() {
144149
mutableCommonProperties.setProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS, SIMPLE_CONSENSUS);

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/DataNodeWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ protected void addStartCmdParams(final List<String> params) {
175175
"-s"));
176176
}
177177

178+
@Override
179+
String getNodeType() {
180+
return "datanode";
181+
}
182+
178183
@Override
179184
protected void reloadMutableFields() {
180185
mutableCommonProperties.setProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS, SIMPLE_CONSENSUS);

integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.Before;
2727

2828
public class IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV1
29-
extends IoTDBRegionMigrateReliabilityITFramework {
29+
extends IoTDBRegionOperationReliabilityITFramework {
3030

3131
@Override
3232
@Before

integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
2323

2424
public class IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2
25-
extends IoTDBRegionMigrateReliabilityITFramework {
25+
extends IoTDBRegionOperationReliabilityITFramework {
2626

2727
@SafeVarargs
2828
public final <T extends Enum<T>> void success(T... dataNodeKillPoints) throws Exception {

0 commit comments

Comments
 (0)