This is an automated email from the ASF dual-hosted git repository.
tanxinyu 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 992abd67952 Add stream mode to iotv2 region migration it (#14417)
992abd67952 is described below
commit 992abd67952709944e9ca93e5a5ff7e10d2f9d31
Author: Peng Junzhi <[email protected]>
AuthorDate: Sun Dec 15 10:22:08 2024 +0800
Add stream mode to iotv2 region migration it (#14417)
* add stream mode to iotv2 region migration it
* improve naming
---
.../iotdb/it/env/cluster/config/MppCommonConfig.java | 6 ++++++
.../it/env/cluster/config/MppSharedCommonConfig.java | 7 +++++++
.../it/env/remote/config/RemoteCommonConfig.java | 5 +++++
.../org/apache/iotdb/itbase/env/CommonConfig.java | 2 ++
.../IoTDBRegionMigrateNormalITForIoTV2Batch.java} | 5 +++--
.../IoTDBRegionMigrateOtherITForIoTV2Batch.java} | 5 +++--
.../IoTDBRegionMigrateNormalITForIoTV2Stream.java} | 19 +++++++++++++++++--
.../IoTDBRegionMigrateOtherITForIoTV2Stream.java} | 19 +++++++++++++++++--
...inatorCrashWhenRemoveRemotePeerForIoTV2Batch.java} | 4 ++--
...IoTDBRegionMigrateDataNodeCrashForIoTV2Batch.java} | 4 ++--
...riginalCrashWhenDeleteLocalPeerForIoTV2Batch.java} | 4 ++--
...iginalCrashWhenRemoveRemotePeerForIoTV2Batch.java} | 4 ++--
...natorCrashWhenRemoveRemotePeerForIoTV2Stream.java} | 17 +++++++++++++++--
...oTDBRegionMigrateDataNodeCrashForIoTV2Stream.java} | 17 +++++++++++++++--
...iginalCrashWhenDeleteLocalPeerForIoTV2Stream.java} | 18 ++++++++++++++++--
...ginalCrashWhenRemoveRemotePeerForIoTV2Stream.java} | 18 ++++++++++++++++--
.../IoTDBRegionMigrateClusterCrashIoTV2Batch.java} | 4 ++--
.../IoTDBRegionMigrateConfigNodeCrashIoTV2Batch.java} | 4 ++--
.../IoTDBRegionMigrateClusterCrashIoTV2Stream.java} | 17 +++++++++++++++--
...IoTDBRegionMigrateConfigNodeCrashIoTV2Stream.java} | 18 ++++++++++++++++--
20 files changed, 165 insertions(+), 32 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
index 0f35b53e23f..791de1ce8c4 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
@@ -203,6 +203,12 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
return this;
}
+ @Override
+ public CommonConfig setIoTConsensusV2Mode(String ioTConsensusV2Mode) {
+ setProperty("iot_consensus_v2_mode", ioTConsensusV2Mode);
+ return this;
+ }
+
@Override
public CommonConfig setSchemaRegionGroupExtensionPolicy(String
schemaRegionGroupExtensionPolicy) {
setProperty("schema_region_group_extension_policy",
schemaRegionGroupExtensionPolicy);
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
index 0a91252956e..46d6751cc10 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
@@ -202,6 +202,13 @@ public class MppSharedCommonConfig implements CommonConfig
{
return this;
}
+ @Override
+ public CommonConfig setIoTConsensusV2Mode(String ioTConsensusV2Mode) {
+ cnConfig.setIoTConsensusV2Mode(ioTConsensusV2Mode);
+ dnConfig.setIoTConsensusV2Mode(ioTConsensusV2Mode);
+ return this;
+ }
+
@Override
public CommonConfig setSchemaRegionGroupExtensionPolicy(String
schemaRegionGroupExtensionPolicy) {
cnConfig.setSchemaRegionGroupExtensionPolicy(schemaRegionGroupExtensionPolicy);
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
index 297faa64e8a..4b3994f8458 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
@@ -145,6 +145,11 @@ public class RemoteCommonConfig implements CommonConfig {
return this;
}
+ @Override
+ public CommonConfig setIoTConsensusV2Mode(String ioTConsensusV2Mode) {
+ return this;
+ }
+
@Override
public CommonConfig setSchemaRegionGroupExtensionPolicy(String
schemaRegionGroupExtensionPolicy) {
return this;
diff --git
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
index cdd83d2a951..f6ad62dacff 100644
---
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
@@ -72,6 +72,8 @@ public interface CommonConfig {
CommonConfig setDataRegionConsensusProtocolClass(String
dataRegionConsensusProtocolClass);
+ CommonConfig setIoTConsensusV2Mode(String ioTConsensusV2Mode);
+
CommonConfig setSchemaRegionGroupExtensionPolicy(String
schemaRegionGroupExtensionPolicy);
CommonConfig setDefaultSchemaRegionGroupNumPerDatabase(int
schemaRegionGroupPerDatabase);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateNormalITForIoTV2Batch.java
similarity index 93%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateNormalITForIoTV2Batch.java
index b78a4a48d5b..fed2a662978 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateNormalITForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.commit;
+package org.apache.iotdb.confignode.it.regionmigration.pass.commit.batch;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
@@ -30,7 +30,8 @@ import org.junit.runner.RunWith;
@Category({ClusterIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateNormalIT extends
IoTDBRegionMigrateReliabilityITFramework {
+public class IoTDBRegionMigrateNormalITForIoTV2Batch
+ extends IoTDBRegionMigrateReliabilityITFramework {
@Test
public void normal1C2DTest() throws Exception {
successTest(1, 1, 1, 2, noKillPoints(), noKillPoints(),
KillNode.ALL_NODES);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateOtherITForIoTV2Batch.java
similarity index 93%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateOtherITForIoTV2Batch.java
index 60bc9d5d42b..a99b49c30ce 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/batch/IoTDBRegionMigrateOtherITForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.commit;
+package org.apache.iotdb.confignode.it.regionmigration.pass.commit.batch;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import org.apache.iotdb.commons.utils.KillPoint.NeverTriggeredKillPoint;
@@ -32,7 +32,8 @@ import org.junit.runner.RunWith;
@RunWith(IoTDBTestRunner.class)
@Category({ClusterIT.class})
-public class IoTDBRegionMigrateOtherIT extends
IoTDBRegionMigrateReliabilityITFramework {
+public class IoTDBRegionMigrateOtherITForIoTV2Batch
+ extends IoTDBRegionMigrateReliabilityITFramework {
@Test
public void badKillPoint() throws Exception {
try {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalITForIoTV2Stream.java
similarity index 76%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalITForIoTV2Stream.java
index b78a4a48d5b..afba878bd39 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateNormalIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateNormalITForIoTV2Stream.java
@@ -17,20 +17,35 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.commit;
+package org.apache.iotdb.confignode.it.regionmigration.pass.commit.stream;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({ClusterIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateNormalIT extends
IoTDBRegionMigrateReliabilityITFramework {
+public class IoTDBRegionMigrateNormalITForIoTV2Stream
+ extends IoTDBRegionMigrateReliabilityITFramework {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void normal1C2DTest() throws Exception {
successTest(1, 1, 1, 2, noKillPoints(), noKillPoints(),
KillNode.ALL_NODES);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateOtherITForIoTV2Stream.java
similarity index 78%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateOtherITForIoTV2Stream.java
index 60bc9d5d42b..9406f2f2fcb 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/IoTDBRegionMigrateOtherIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/commit/stream/IoTDBRegionMigrateOtherITForIoTV2Stream.java
@@ -17,22 +17,37 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.commit;
+package org.apache.iotdb.confignode.it.regionmigration.pass.commit.stream;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import org.apache.iotdb.commons.utils.KillPoint.NeverTriggeredKillPoint;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
+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.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@RunWith(IoTDBTestRunner.class)
@Category({ClusterIT.class})
-public class IoTDBRegionMigrateOtherIT extends
IoTDBRegionMigrateReliabilityITFramework {
+public class IoTDBRegionMigrateOtherITForIoTV2Stream
+ extends IoTDBRegionMigrateReliabilityITFramework {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void badKillPoint() throws Exception {
try {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Batch.java
similarity index 97%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Batch.java
index a49c6dee8f3..91b34566755 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.batch;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusRemovePeerCoordinatorKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT
+public class
IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Batch
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
@Test
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateDataNodeCrashForIoTV2Batch.java
similarity index 97%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateDataNodeCrashForIoTV2Batch.java
index dc71b026fae..4938ed6d8b8 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateDataNodeCrashForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.batch;
import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateDataNodeCrashForIoTV2IT
+public class IoTDBRegionMigrateDataNodeCrashForIoTV2Batch
extends IoTDBRegionMigrateReliabilityITFramework {
// region Coordinator DataNode crash tests
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Batch.java
similarity index 97%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Batch.java
index 8fe95ce3697..9162fb078c3 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.batch;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusDeleteLocalPeerKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT
+public class IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Batch
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
@Test
public void crashBeforeDelete() throws Exception {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Batch.java
similarity index 97%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Batch.java
index 13bb8472c9f..a90bbd92870 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/batch/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.batch;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusInactivatePeerKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
@@ -30,7 +30,7 @@ import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT
+public class IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Batch
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
@Test
public void crashBeforeInactivate() throws Exception {
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Stream.java
similarity index 83%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Stream.java
index a49c6dee8f3..7068bf8c7d1 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Stream.java
@@ -17,22 +17,35 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.stream;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusRemovePeerCoordinatorKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2IT
+public class
IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerForIoTV2Stream
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void initCrash() throws Exception {
success(IoTConsensusRemovePeerCoordinatorKillPoints.INIT);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateDataNodeCrashForIoTV2Stream.java
similarity index 87%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateDataNodeCrashForIoTV2Stream.java
index dc71b026fae..adadc8d0de9 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateDataNodeCrashForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateDataNodeCrashForIoTV2Stream.java
@@ -17,21 +17,24 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.stream;
import org.apache.iotdb.commons.utils.KillPoint.DataNodeKillPoints;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateDataNodeCrashForIoTV2IT
+public class IoTDBRegionMigrateDataNodeCrashForIoTV2Stream
extends IoTDBRegionMigrateReliabilityITFramework {
// region Coordinator DataNode crash tests
@@ -40,6 +43,16 @@ public class IoTDBRegionMigrateDataNodeCrashForIoTV2IT
private final int configNodeNum = 1;
private final int dataNodeNum = 3;
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void coordinatorCrashDuringAddPeerTransition() throws Exception {
failTest(
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Stream.java
similarity index 81%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Stream.java
index 8fe95ce3697..5878a4c0a59 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Stream.java
@@ -17,21 +17,35 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.stream;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusDeleteLocalPeerKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2IT
+public class IoTDBRegionMigrateOriginalCrashWhenDeleteLocalPeerForIoTV2Stream
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void crashBeforeDelete() throws Exception {
success(IoTConsensusDeleteLocalPeerKillPoints.BEFORE_DELETE);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Stream.java
similarity index 81%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Stream.java
index 13bb8472c9f..61ca42c53bb 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/datanodecrash/iotv2/stream/IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Stream.java
@@ -17,21 +17,35 @@
* under the License.
*/
-package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2;
+package
org.apache.iotdb.confignode.it.regionmigration.pass.daily.datanodecrash.iotv2.stream;
import
org.apache.iotdb.commons.utils.KillPoint.IoTConsensusInactivatePeerKillPoints;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2IT
+public class IoTDBRegionMigrateOriginalCrashWhenRemoveRemotePeerForIoTV2Stream
extends IoTDBRegionMigrateDataNodeCrashITFrameworkForIoTV2 {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void crashBeforeInactivate() throws Exception {
success(IoTConsensusInactivatePeerKillPoints.BEFORE_INACTIVATE);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateClusterCrashIoTV2Batch.java
similarity index 97%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateClusterCrashIoTV2Batch.java
index 30011056041..faf1c21778f 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateClusterCrashIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2;
+package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2.batch;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState;
@@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateClusterCrashIoTV2IT
+public class IoTDBRegionMigrateClusterCrashIoTV2Batch
extends IoTDBRegionMigrateReliabilityITFramework {
@Test
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateConfigNodeCrashIoTV2Batch.java
similarity index 98%
copy from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
copy to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateConfigNodeCrashIoTV2Batch.java
index d1bfc6519a0..f3fa4a055ea 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/batch/IoTDBRegionMigrateConfigNodeCrashIoTV2Batch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2;
+package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2.batch;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import org.apache.iotdb.commons.utils.KillPoint.KillPoint;
@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateConfigNodeCrashIoTV2IT
+public class IoTDBRegionMigrateConfigNodeCrashIoTV2Batch
extends IoTDBRegionMigrateReliabilityITFramework {
@Test
@Ignore
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateClusterCrashIoTV2Stream.java
similarity index 85%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateClusterCrashIoTV2Stream.java
index 30011056041..4c11e39cf8d 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateClusterCrashIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateClusterCrashIoTV2Stream.java
@@ -17,23 +17,36 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2;
+package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2.stream;
import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabilityITFramework;
import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState;
import org.apache.iotdb.confignode.procedure.state.RemoveRegionPeerState;
+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.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateClusterCrashIoTV2IT
+public class IoTDBRegionMigrateClusterCrashIoTV2Stream
extends IoTDBRegionMigrateReliabilityITFramework {
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
public void clusterCrash1() throws Exception {
killClusterTest(buildSet(AddRegionPeerState.CREATE_NEW_REGION_PEER), true);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateConfigNodeCrashIoTV2Stream.java
similarity index 91%
rename from
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
rename to
integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateConfigNodeCrashIoTV2Stream.java
index d1bfc6519a0..d7c1a14d19b 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/IoTDBRegionMigrateConfigNodeCrashIoTV2IT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/daily/iotv2/stream/IoTDBRegionMigrateConfigNodeCrashIoTV2Stream.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2;
+package org.apache.iotdb.confignode.it.regionmigration.pass.daily.iotv2.stream;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import org.apache.iotdb.commons.utils.KillPoint.KillPoint;
@@ -25,9 +25,12 @@ import
org.apache.iotdb.confignode.it.regionmigration.IoTDBRegionMigrateReliabil
import org.apache.iotdb.confignode.procedure.state.AddRegionPeerState;
import org.apache.iotdb.confignode.procedure.state.RegionTransitionState;
import org.apache.iotdb.confignode.procedure.state.RemoveRegionPeerState;
+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.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,8 +42,19 @@ import java.util.stream.Collectors;
@Category({DailyIT.class})
@RunWith(IoTDBTestRunner.class)
-public class IoTDBRegionMigrateConfigNodeCrashIoTV2IT
+public class IoTDBRegionMigrateConfigNodeCrashIoTV2Stream
extends IoTDBRegionMigrateReliabilityITFramework {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ EnvFactory.getEnv()
+ .getConfig()
+ .getCommonConfig()
+ .setIoTConsensusV2Mode(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
+ }
+
@Test
@Ignore
public void cnCrashDuringPreCheckTest() throws Exception {
