This is an automated email from the ASF dual-hosted git repository.
rong 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 77d61207f6c Pipe IT: Fix CN connection timeout in IT is not functional
(#12563)
77d61207f6c is described below
commit 77d61207f6cd1816a042b961b6bca6ac83b58131
Author: Caideyipi <[email protected]>
AuthorDate: Tue May 21 16:26:19 2024 +0800
Pipe IT: Fix CN connection timeout in IT is not functional (#12563)
---
.../apache/iotdb/it/env/cluster/config/MppCommonConfig.java | 6 ++++++
.../iotdb/it/env/cluster/config/MppConfigNodeConfig.java | 6 ------
.../iotdb/it/env/cluster/config/MppSharedCommonConfig.java | 7 +++++++
.../iotdb/it/env/remote/config/RemoteCommonConfig.java | 5 +++++
.../iotdb/it/env/remote/config/RemoteConfigNodeConfig.java | 5 -----
.../main/java/org/apache/iotdb/itbase/env/CommonConfig.java | 2 ++
.../java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java | 2 --
.../iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java | 4 ++--
.../apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java | 4 ++--
.../iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java | 4 ++--
.../iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java | 4 ++--
.../apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java | 12 ++++++------
.../iotdb/pipe/it/manual/AbstractPipeDualManualIT.java | 4 ++--
.../iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java | 4 ++--
.../iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java | 4 ++--
.../apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java | 2 +-
.../subscription/it/dual/AbstractSubscriptionDualIT.java | 4 ++--
18 files changed, 45 insertions(+), 38 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 595bc4ddaa6..95fed66d08b 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
@@ -432,6 +432,12 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
return this;
}
+ @Override
+ public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
+ setProperty("cn_connection_timeout_ms",
String.valueOf(connectionTimeoutMs));
+ return this;
+ }
+
// For part of the log directory
public String getClusterConfigStr() {
return
fromConsensusFullNameToAbbr(properties.getProperty(CONFIG_NODE_CONSENSUS_PROTOCOL_CLASS))
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppConfigNodeConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppConfigNodeConfig.java
index 7fc6494a212..62ccbb0aa4f 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppConfigNodeConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppConfigNodeConfig.java
@@ -55,10 +55,4 @@ public class MppConfigNodeConfig extends MppBaseConfig
implements ConfigNodeConf
properties.setProperty("cn_metric_reporter_list", String.join(",",
metricReporterTypes));
return this;
}
-
- @Override
- public ConfigNodeConfig setConnectionTimeoutMs(long connectionTimeoutMs) {
- properties.setProperty("cn_connection_timeout_ms",
String.valueOf(connectionTimeoutMs));
- return this;
- }
}
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 96ab48ab58f..1851590dd41 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
@@ -438,4 +438,11 @@ public class MppSharedCommonConfig implements CommonConfig
{
cnConfig.setTagAttributeTotalSize(tagAttributeTotalSize);
return this;
}
+
+ @Override
+ public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
+ dnConfig.setCnConnectionTimeoutMs(connectionTimeoutMs);
+ cnConfig.setCnConnectionTimeoutMs(connectionTimeoutMs);
+ return this;
+ }
}
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 2a97a53f589..0ac82fc8713 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
@@ -308,4 +308,9 @@ public class RemoteCommonConfig implements CommonConfig {
public CommonConfig setTagAttributeTotalSize(int tagAttributeTotalSize) {
return this;
}
+
+ @Override
+ public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
+ return this;
+ }
}
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteConfigNodeConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteConfigNodeConfig.java
index b9349b9023a..33a6bc48afd 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteConfigNodeConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteConfigNodeConfig.java
@@ -28,9 +28,4 @@ public class RemoteConfigNodeConfig implements
ConfigNodeConfig {
public ConfigNodeConfig setMetricReporterType(List<String>
metricReporterTypes) {
return this;
}
-
- @Override
- public ConfigNodeConfig setConnectionTimeoutMs(long connectionTimeoutMs) {
- 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 5bd7805aa49..af47c8254e5 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
@@ -137,4 +137,6 @@ public interface CommonConfig {
CommonConfig setWalMode(String walMode);
CommonConfig setTagAttributeTotalSize(int tagAttributeTotalSize);
+
+ CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs);
}
diff --git
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java
index 31a955417d2..bf7179ef702 100644
---
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java
@@ -24,6 +24,4 @@ import java.util.List;
/** This interface is used to handle properties in
iotdb-confignode.properties. */
public interface ConfigNodeConfig {
ConfigNodeConfig setMetricReporterType(List<String> metricReporterTypes);
-
- ConfigNodeConfig setConnectionTimeoutMs(long connectionTimeoutMs);
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java
index d733d5523a6..a0a27791a31 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java
@@ -52,8 +52,8 @@ abstract class AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java
index c7e0289adc5..e90c7ecf8ad 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java
@@ -85,8 +85,8 @@ public class IoTDBPipeClusterIT extends
AbstractPipeDualAutoIT {
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(3, 3, 180);
receiverEnv.initClusterEnvironment(3, 3, 180);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java
index e5f76a00eb0..be4aa458d9f 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeConnectorCompressionIT.java
@@ -68,8 +68,8 @@ public class IoTDBPipeConnectorCompressionIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java
index 0f8d1f82448..2cd7e287796 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java
@@ -74,8 +74,8 @@ public class IoTDBPipeIdempotentIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java
index 81d4dbefcbf..4556416f5fb 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java
@@ -67,8 +67,8 @@ public class IoTDBPipeProcessorIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java
index e8e11e6fec9..373e9d4dbea 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java
@@ -86,8 +86,8 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setDataReplicationFactor(dataRegionReplicationFactor);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(configNodesNum, dataNodesNum);
receiverEnv.initClusterEnvironment(configNodesNum, dataNodesNum);
@@ -180,8 +180,8 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setDataReplicationFactor(1);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(3, 3);
receiverEnv.initClusterEnvironment(1, 1);
@@ -373,8 +373,8 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setDataReplicationFactor(2);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(1, 1);
receiverEnv.initClusterEnvironment(1, 3);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java
index 61f42482dc4..ae81f1ffb20 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/AbstractPipeDualManualIT.java
@@ -52,8 +52,8 @@ abstract class AbstractPipeDualManualIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
index c917acbde1a..89662c19f63 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
@@ -74,8 +74,8 @@ public class IoTDBPipeMetaHistoricalIT extends
AbstractPipeDualManualIT {
.setDataReplicationFactor(2);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment(3, 3);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
index 5928e6e33c7..fb70e8e3783 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
@@ -59,8 +59,8 @@ public class IoTDBPipeMetaLeaderChangeIT extends
AbstractPipeDualManualIT {
.setSchemaReplicationFactor(3);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(3, 3, 180);
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
index c03c0b499b5..70bb4df4a93 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
@@ -35,7 +35,7 @@ abstract class AbstractPipeSingleIT {
env = MultiEnvFactory.getEnv(0);
env.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
// 10 min, assert that the operations will not time out
- env.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ env.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
env.initClusterEnvironment();
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
index ecad24e2b4b..00e393bdb50 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
@@ -41,8 +41,8 @@ abstract class AbstractSubscriptionDualIT {
receiverEnv.getConfig().getCommonConfig().setPipeAirGapReceiverEnabled(true);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
-
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
