Skip to content

Commit 442dc86

Browse files
VGalaxiesPengzna
VGalaxies
and
Pengzna
authored
PipeConsensus: apply IoTConsensusV2 as cluster mode for integration test (apache#13481)
Co-authored-by: Peng Junzhi <[email protected]>
1 parent 86a3377 commit 442dc86

File tree

67 files changed

+429
-119
lines changed

Some content is hidden

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

67 files changed

+429
-119
lines changed

‎.github/workflows/pipe-it-2cluster.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
matrix:
4040
java: [17]
4141
# StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet.
42-
cluster: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode]
42+
cluster: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode, PipeConsensusBatchMode, PipeConsensusStreamMode]
4343
os: [ ubuntu-latest ]
4444
runs-on: ${{ matrix.os }}
4545
steps:
@@ -76,7 +76,7 @@ jobs:
7676
matrix:
7777
java: [17]
7878
# StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet.
79-
cluster1: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode]
79+
cluster1: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode, PipeConsensusBatchMode, PipeConsensusStreamMode]
8080
cluster2: [LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode]
8181
os: [ ubuntu-latest ]
8282
exclude:
@@ -92,6 +92,14 @@ jobs:
9292
cluster2: LightWeightStandaloneMode
9393
- cluster1: HighPerformanceMode
9494
cluster2: HighPerformanceMode
95+
- cluster1: PipeConsensusBatchMode
96+
cluster2: LightWeightStandaloneMode
97+
- cluster1: PipeConsensusBatchMode
98+
cluster2: HighPerformanceMode
99+
- cluster1: PipeConsensusStreamMode
100+
cluster2: LightWeightStandaloneMode
101+
- cluster1: PipeConsensusStreamMode
102+
cluster2: HighPerformanceMode
95103
runs-on: ${{ matrix.os }}
96104
steps:
97105
- uses: actions/checkout@v4
@@ -127,7 +135,7 @@ jobs:
127135
matrix:
128136
java: [ 17 ]
129137
# StrongConsistencyClusterMode is ignored now because RatisConsensus has not been supported yet.
130-
cluster1: [ LightWeightStandaloneMode, ScalableSingleNodeMode, HighPerformanceMode ]
138+
cluster1: [ ScalableSingleNodeMode ]
131139
cluster2: [ ScalableSingleNodeMode ]
132140
os: [ ubuntu-latest ]
133141
runs-on: ${{ matrix.os }}

‎integration-test/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,20 @@
6767
<strongConsistencyClusterMode.dataRegionReplicaNumber>3</strongConsistencyClusterMode.dataRegionReplicaNumber>
6868
<strongConsistencyClusterMode.schemaRegionConsensus>Ratis</strongConsistencyClusterMode.schemaRegionConsensus>
6969
<strongConsistencyClusterMode.schemaRegionReplicaNumber>3</strongConsistencyClusterMode.schemaRegionReplicaNumber>
70+
<pipeConsensusBatchMode.configNodeConsensus>Ratis</pipeConsensusBatchMode.configNodeConsensus>
71+
<pipeConsensusBatchMode.configNodeNumber>1</pipeConsensusBatchMode.configNodeNumber>
72+
<pipeConsensusBatchMode.dataNodeNumber>3</pipeConsensusBatchMode.dataNodeNumber>
73+
<pipeConsensusBatchMode.dataRegionConsensus>IoTV2</pipeConsensusBatchMode.dataRegionConsensus>
74+
<pipeConsensusBatchMode.dataRegionReplicaNumber>2</pipeConsensusBatchMode.dataRegionReplicaNumber>
75+
<pipeConsensusBatchMode.schemaRegionConsensus>Ratis</pipeConsensusBatchMode.schemaRegionConsensus>
76+
<pipeConsensusBatchMode.schemaRegionReplicaNumber>3</pipeConsensusBatchMode.schemaRegionReplicaNumber>
77+
<pipeConsensusStreamMode.configNodeConsensus>Ratis</pipeConsensusStreamMode.configNodeConsensus>
78+
<pipeConsensusStreamMode.configNodeNumber>1</pipeConsensusStreamMode.configNodeNumber>
79+
<pipeConsensusStreamMode.dataNodeNumber>3</pipeConsensusStreamMode.dataNodeNumber>
80+
<pipeConsensusStreamMode.dataRegionConsensus>IoTV2</pipeConsensusStreamMode.dataRegionConsensus>
81+
<pipeConsensusStreamMode.dataRegionReplicaNumber>2</pipeConsensusStreamMode.dataRegionReplicaNumber>
82+
<pipeConsensusStreamMode.schemaRegionConsensus>Ratis</pipeConsensusStreamMode.schemaRegionConsensus>
83+
<pipeConsensusStreamMode.schemaRegionReplicaNumber>3</pipeConsensusStreamMode.schemaRegionReplicaNumber>
7084
</properties>
7185
<dependencies>
7286
<dependency>
@@ -314,6 +328,20 @@
314328
<strongConsistencyClusterMode.dataRegionConsensus>${strongConsistencyClusterMode.dataRegionConsensus}</strongConsistencyClusterMode.dataRegionConsensus>
315329
<strongConsistencyClusterMode.schemaRegionReplicaNumber>${strongConsistencyClusterMode.schemaRegionReplicaNumber}</strongConsistencyClusterMode.schemaRegionReplicaNumber>
316330
<strongConsistencyClusterMode.dataRegionReplicaNumber>${strongConsistencyClusterMode.dataRegionReplicaNumber}</strongConsistencyClusterMode.dataRegionReplicaNumber>
331+
<pipeConsensusBatchMode.configNodeNumber>${pipeConsensusBatchMode.configNodeNumber}</pipeConsensusBatchMode.configNodeNumber>
332+
<pipeConsensusBatchMode.dataNodeNumber>${pipeConsensusBatchMode.dataNodeNumber}</pipeConsensusBatchMode.dataNodeNumber>
333+
<pipeConsensusBatchMode.configNodeConsensus>${pipeConsensusBatchMode.configNodeConsensus}</pipeConsensusBatchMode.configNodeConsensus>
334+
<pipeConsensusBatchMode.schemaRegionConsensus>${pipeConsensusBatchMode.schemaRegionConsensus}</pipeConsensusBatchMode.schemaRegionConsensus>
335+
<pipeConsensusBatchMode.dataRegionConsensus>${pipeConsensusBatchMode.dataRegionConsensus}</pipeConsensusBatchMode.dataRegionConsensus>
336+
<pipeConsensusBatchMode.schemaRegionReplicaNumber>${pipeConsensusBatchMode.schemaRegionReplicaNumber}</pipeConsensusBatchMode.schemaRegionReplicaNumber>
337+
<pipeConsensusBatchMode.dataRegionReplicaNumber>${pipeConsensusBatchMode.dataRegionReplicaNumber}</pipeConsensusBatchMode.dataRegionReplicaNumber>
338+
<pipeConsensusStreamMode.configNodeNumber>${pipeConsensusStreamMode.configNodeNumber}</pipeConsensusStreamMode.configNodeNumber>
339+
<pipeConsensusStreamMode.dataNodeNumber>${pipeConsensusStreamMode.dataNodeNumber}</pipeConsensusStreamMode.dataNodeNumber>
340+
<pipeConsensusStreamMode.configNodeConsensus>${pipeConsensusStreamMode.configNodeConsensus}</pipeConsensusStreamMode.configNodeConsensus>
341+
<pipeConsensusStreamMode.schemaRegionConsensus>${pipeConsensusStreamMode.schemaRegionConsensus}</pipeConsensusStreamMode.schemaRegionConsensus>
342+
<pipeConsensusStreamMode.dataRegionConsensus>${pipeConsensusStreamMode.dataRegionConsensus}</pipeConsensusStreamMode.dataRegionConsensus>
343+
<pipeConsensusStreamMode.schemaRegionReplicaNumber>${pipeConsensusStreamMode.schemaRegionReplicaNumber}</pipeConsensusStreamMode.schemaRegionReplicaNumber>
344+
<pipeConsensusStreamMode.dataRegionReplicaNumber>${pipeConsensusStreamMode.dataRegionReplicaNumber}</pipeConsensusStreamMode.dataRegionReplicaNumber>
317345
</systemPropertyVariables>
318346
<summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>
319347
</configuration>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public class ClusterConstant {
5252
public static final String SCALABLE_SINGLE_NODE_MODE = "ScalableSingleNodeMode";
5353
public static final String HIGH_PERFORMANCE_MODE = "HighPerformanceMode";
5454
public static final String STRONG_CONSISTENCY_CLUSTER_MODE = "StrongConsistencyClusterMode";
55+
public static final String PIPE_CONSENSUS_BATCH_MODE = "PipeConsensusBatchMode";
56+
public static final String PIPE_CONSENSUS_STREAM_MODE = "PipeConsensusStreamMode";
5557

5658
// System arguments in pom.xml
5759
public static final String LIGHT_WEIGHT_STANDALONE_MODE_CONFIG_NODE_NUM =
@@ -114,6 +116,36 @@ public class ClusterConstant {
114116
public static final String STRONG_CONSISTENCY_CLUSTER_MODE_DATA_REGION_REPLICA_NUM =
115117
"strongConsistencyClusterMode.dataRegionReplicaNumber";
116118

119+
public static final String PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_NUM =
120+
"pipeConsensusBatchMode.configNodeNumber";
121+
public static final String PIPE_CONSENSUS_BATCH_MODE_DATA_NODE_NUM =
122+
"pipeConsensusBatchMode.dataNodeNumber";
123+
public static final String PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_CONSENSUS =
124+
"pipeConsensusBatchMode.configNodeConsensus";
125+
public static final String PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_CONSENSUS =
126+
"pipeConsensusBatchMode.schemaRegionConsensus";
127+
public static final String PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_CONSENSUS =
128+
"pipeConsensusBatchMode.dataRegionConsensus";
129+
public static final String PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_REPLICA_NUM =
130+
"pipeConsensusBatchMode.schemaRegionReplicaNumber";
131+
public static final String PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_REPLICA_NUM =
132+
"pipeConsensusBatchMode.dataRegionReplicaNumber";
133+
134+
public static final String PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_NUM =
135+
"pipeConsensusStreamMode.configNodeNumber";
136+
public static final String PIPE_CONSENSUS_STREAM_MODE_DATA_NODE_NUM =
137+
"pipeConsensusStreamMode.dataNodeNumber";
138+
public static final String PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_CONSENSUS =
139+
"pipeConsensusStreamMode.configNodeConsensus";
140+
public static final String PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_CONSENSUS =
141+
"pipeConsensusStreamMode.schemaRegionConsensus";
142+
public static final String PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_CONSENSUS =
143+
"pipeConsensusStreamMode.dataRegionConsensus";
144+
public static final String PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_REPLICA_NUM =
145+
"pipeConsensusStreamMode.schemaRegionReplicaNumber";
146+
public static final String PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_REPLICA_NUM =
147+
"pipeConsensusStreamMode.dataRegionReplicaNumber";
148+
117149
// Property file names
118150
public static final String IOTDB_SYSTEM_PROPERTIES_FILE = "iotdb-system.properties";
119151

@@ -125,6 +157,7 @@ public class ClusterConstant {
125157
"schema_region_consensus_protocol_class";
126158
public static final String DATA_REGION_CONSENSUS_PROTOCOL_CLASS =
127159
"data_region_consensus_protocol_class";
160+
public static final String IOT_CONSENSUS_V2_MODE = "iot_consensus_v2_mode";
128161
public static final String SCHEMA_REPLICATION_FACTOR = "schema_replication_factor";
129162
public static final String DATA_REPLICATION_FACTOR = "data_replication_factor";
130163

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LIGHT_WEIGHT_STANDALONE_MODE_CONFIG_NODE_NUM;
5050
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LIGHT_WEIGHT_STANDALONE_MODE_DATA_NODE_NUM;
5151
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LOCK_FILE_PATH;
52+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE;
53+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_NUM;
54+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_DATA_NODE_NUM;
55+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE;
56+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_NUM;
57+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_DATA_NODE_NUM;
5258
import static org.apache.iotdb.it.env.cluster.ClusterConstant.RATIS_CONSENSUS_STR;
5359
import static org.apache.iotdb.it.env.cluster.ClusterConstant.SCALABLE_SINGLE_NODE_MODE;
5460
import static org.apache.iotdb.it.env.cluster.ClusterConstant.SCALABLE_SINGLE_NODE_MODE_CONFIG_NODE_NUM;
@@ -142,6 +148,14 @@ private static Pair<Integer, Integer> getClusterNodesNum(final int index) {
142148
return new Pair<>(
143149
Integer.parseInt(System.getProperty(STRONG_CONSISTENCY_CLUSTER_MODE_CONFIG_NODE_NUM)),
144150
Integer.parseInt(System.getProperty(STRONG_CONSISTENCY_CLUSTER_MODE_DATA_NODE_NUM)));
151+
case PIPE_CONSENSUS_BATCH_MODE:
152+
return new Pair<>(
153+
Integer.parseInt(System.getProperty(PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_NUM)),
154+
Integer.parseInt(System.getProperty(PIPE_CONSENSUS_BATCH_MODE_DATA_NODE_NUM)));
155+
case PIPE_CONSENSUS_STREAM_MODE:
156+
return new Pair<>(
157+
Integer.parseInt(System.getProperty(PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_NUM)),
158+
Integer.parseInt(System.getProperty(PIPE_CONSENSUS_STREAM_MODE_DATA_NODE_NUM)));
145159
default:
146160
// Print nothing to avoid polluting test outputs
147161
return null;

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

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

2222
import org.apache.iotdb.commons.conf.IoTDBConstant;
23+
import org.apache.iotdb.consensus.ConsensusFactory;
2324
import org.apache.iotdb.it.env.EnvFactory;
2425
import org.apache.iotdb.it.env.cluster.config.MppBaseConfig;
2526
import org.apache.iotdb.it.env.cluster.config.MppCommonConfig;
@@ -79,6 +80,7 @@
7980
import static org.apache.iotdb.it.env.cluster.ClusterConstant.HIGH_PERFORMANCE_MODE_SCHEMA_REGION_REPLICA_NUM;
8081
import static org.apache.iotdb.it.env.cluster.ClusterConstant.HYPHEN;
8182
import static org.apache.iotdb.it.env.cluster.ClusterConstant.INFLUXDB_RPC_PORT;
83+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.IOT_CONSENSUS_V2_MODE;
8284
import static org.apache.iotdb.it.env.cluster.ClusterConstant.JAVA_CMD;
8385
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LIGHT_WEIGHT_STANDALONE_MODE;
8486
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LIGHT_WEIGHT_STANDALONE_MODE_CONFIG_NODE_CONSENSUS;
@@ -88,6 +90,18 @@
8890
import static org.apache.iotdb.it.env.cluster.ClusterConstant.LIGHT_WEIGHT_STANDALONE_MODE_SCHEMA_REGION_REPLICA_NUM;
8991
import static org.apache.iotdb.it.env.cluster.ClusterConstant.MQTT_HOST;
9092
import static org.apache.iotdb.it.env.cluster.ClusterConstant.MQTT_PORT;
93+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE;
94+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_CONSENSUS;
95+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_CONSENSUS;
96+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_REPLICA_NUM;
97+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_CONSENSUS;
98+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_REPLICA_NUM;
99+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE;
100+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_CONSENSUS;
101+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_CONSENSUS;
102+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_REPLICA_NUM;
103+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_CONSENSUS;
104+
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_REPLICA_NUM;
91105
import static org.apache.iotdb.it.env.cluster.ClusterConstant.PIPE_LIB_DIR;
92106
import static org.apache.iotdb.it.env.cluster.ClusterConstant.REST_SERVICE_PORT;
93107
import static org.apache.iotdb.it.env.cluster.ClusterConstant.SCALABLE_SINGLE_NODE_MODE;
@@ -401,6 +415,52 @@ private void reloadClusterConfigurations() {
401415
DATA_REPLICATION_FACTOR,
402416
System.getProperty(STRONG_CONSISTENCY_CLUSTER_MODE_DATA_REGION_REPLICA_NUM));
403417
break;
418+
case PIPE_CONSENSUS_BATCH_MODE:
419+
clusterConfigProperties.setProperty(
420+
CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS,
421+
fromConsensusAbbrToFullName(
422+
System.getProperty(PIPE_CONSENSUS_BATCH_MODE_CONFIG_NODE_CONSENSUS)));
423+
clusterConfigProperties.setProperty(
424+
SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS,
425+
fromConsensusAbbrToFullName(
426+
System.getProperty(PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_CONSENSUS)));
427+
clusterConfigProperties.setProperty(
428+
DATA_REGION_CONSENSUS_PROTOCOL_CLASS,
429+
fromConsensusAbbrToFullName(
430+
System.getProperty(PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_CONSENSUS)));
431+
clusterConfigProperties.setProperty(
432+
SCHEMA_REPLICATION_FACTOR,
433+
System.getProperty(PIPE_CONSENSUS_BATCH_MODE_SCHEMA_REGION_REPLICA_NUM));
434+
clusterConfigProperties.setProperty(
435+
DATA_REPLICATION_FACTOR,
436+
System.getProperty(PIPE_CONSENSUS_BATCH_MODE_DATA_REGION_REPLICA_NUM));
437+
// set mode
438+
clusterConfigProperties.setProperty(
439+
IOT_CONSENSUS_V2_MODE, ConsensusFactory.IOT_CONSENSUS_V2_BATCH_MODE);
440+
break;
441+
case PIPE_CONSENSUS_STREAM_MODE:
442+
clusterConfigProperties.setProperty(
443+
CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS,
444+
fromConsensusAbbrToFullName(
445+
System.getProperty(PIPE_CONSENSUS_STREAM_MODE_CONFIG_NODE_CONSENSUS)));
446+
clusterConfigProperties.setProperty(
447+
SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS,
448+
fromConsensusAbbrToFullName(
449+
System.getProperty(PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_CONSENSUS)));
450+
clusterConfigProperties.setProperty(
451+
DATA_REGION_CONSENSUS_PROTOCOL_CLASS,
452+
fromConsensusAbbrToFullName(
453+
System.getProperty(PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_CONSENSUS)));
454+
clusterConfigProperties.setProperty(
455+
SCHEMA_REPLICATION_FACTOR,
456+
System.getProperty(PIPE_CONSENSUS_STREAM_MODE_SCHEMA_REGION_REPLICA_NUM));
457+
clusterConfigProperties.setProperty(
458+
DATA_REPLICATION_FACTOR,
459+
System.getProperty(PIPE_CONSENSUS_STREAM_MODE_DATA_REGION_REPLICA_NUM));
460+
// set mode
461+
clusterConfigProperties.setProperty(
462+
IOT_CONSENSUS_V2_MODE, ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE);
463+
break;
404464
default:
405465
// Print nothing to avoid polluting test outputs
406466
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public class IoTDBRegionMigrateReliabilityITFramework {
9090
private static final String COUNT_TIMESERIES = "select count(*) from root.sg.**";
9191
private static final String REGION_MIGRATE_COMMAND_FORMAT = "migrate region %d from %d to %d";
9292
private static final String CONFIGURATION_FILE_NAME = "configuration.dat";
93+
protected final boolean isIoTV1 = true;
9394
ExecutorService executorService = IoTDBThreadPoolFactory.newCachedThreadPool("regionMigrateIT");
9495

9596
public static Consumer<KillPointContext> actionOfKillNode =

‎integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/pass/datanodecrash/IoTDBRegionMigrateCoordinatorCrashWhenRemoveRemotePeerIT.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ public void initCrash() throws Exception {
4040

4141
@Test
4242
public void crashAfterNotifyPeersToRemoveSyncLogChannel() throws Exception {
43-
success(
44-
IoTConsensusRemovePeerCoordinatorKillPoints.AFTER_NOTIFY_PEERS_TO_REMOVE_SYNC_LOG_CHANNEL);
43+
if (isIoTV1) {
44+
success(
45+
IoTConsensusRemovePeerCoordinatorKillPoints
46+
.AFTER_NOTIFY_PEERS_TO_REMOVE_SYNC_LOG_CHANNEL);
47+
}
4548
}
4649

4750
@Test

0 commit comments

Comments
 (0)