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 e8d11ce91b8 Pipe IT: Configured the connection timeout ms parameter to
avoid premature timeout of pipe creation in ITs (#12295)
e8d11ce91b8 is described below
commit e8d11ce91b871fcc41dceecd54b09a6089310da6
Author: Caideyipi <[email protected]>
AuthorDate: Mon Apr 8 11:20:33 2024 +0800
Pipe IT: Configured the connection timeout ms parameter to avoid premature
timeout of pipe creation in ITs (#12295)
---
.../iotdb/it/env/cluster/config/MppConfigNodeConfig.java | 6 ++++++
.../iotdb/it/env/remote/config/RemoteConfigNodeConfig.java | 6 ++++++
.../java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java | 2 ++
.../iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java | 4 ++++
.../apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.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 ++++
13 files changed, 60 insertions(+)
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 62ccbb0aa4f..7fc6494a212 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,4 +55,10 @@ 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/remote/config/RemoteConfigNodeConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteConfigNodeConfig.java
index 5c40fd6ef6b..b9349b9023a 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
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.iotdb.it.env.remote.config;
import org.apache.iotdb.itbase.env.ConfigNodeConfig;
@@ -27,4 +28,9 @@ 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/ConfigNodeConfig.java
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/ConfigNodeConfig.java
index bf7179ef702..31a955417d2 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,4 +24,6 @@ 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 034b25a4e85..d733d5523a6 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
@@ -51,6 +51,10 @@ abstract class AbstractPipeDualAutoIT {
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
.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.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 1e551f1c6f0..e0194f8c591 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
@@ -84,6 +84,10 @@ public class IoTDBPipeClusterIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
.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.initClusterEnvironment(3, 3, 180);
receiverEnv.initClusterEnvironment(3, 3, 180);
}
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 f548ed616be..0f8d1f82448 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
@@ -73,6 +73,10 @@ public class IoTDBPipeIdempotentIT extends
AbstractPipeDualAutoIT {
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
.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.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 08a0d760c8a..81d4dbefcbf 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
@@ -66,6 +66,10 @@ public class IoTDBPipeProcessorIT extends
AbstractPipeDualAutoIT {
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
.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.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 faee1ba94e9..be211ca08d5 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
@@ -85,6 +85,10 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setSchemaReplicationFactor(schemaRegionReplicationFactor)
.setDataReplicationFactor(dataRegionReplicationFactor);
+ // 10 min, assert that the operations will not time out
+ senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
senderEnv.initClusterEnvironment(configNodesNum, dataNodesNum);
receiverEnv.initClusterEnvironment(configNodesNum, dataNodesNum);
}
@@ -175,6 +179,10 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setSchemaReplicationFactor(1)
.setDataReplicationFactor(1);
+ // 10 min, assert that the operations will not time out
+ senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
senderEnv.initClusterEnvironment(3, 3);
receiverEnv.initClusterEnvironment(1, 1);
@@ -364,6 +372,10 @@ public class IoTDBPipeProtocolIT extends
AbstractPipeDualAutoIT {
.setSchemaReplicationFactor(3)
.setDataReplicationFactor(2);
+ // 10 min, assert that the operations will not time out
+ senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(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 ac72e44b8af..61f42482dc4 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
@@ -51,6 +51,10 @@ abstract class AbstractPipeDualManualIT {
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
.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.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 061f57d2131..e15a8f6b708 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
@@ -72,6 +72,10 @@ public class IoTDBPipeMetaHistoricalIT extends
AbstractPipeDualManualIT {
.setSchemaReplicationFactor(3)
.setDataReplicationFactor(2);
+ // 10 min, assert that the operations will not time out
+ senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(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 d220294e6cb..7aed42e9371 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
@@ -58,6 +58,10 @@ public class IoTDBPipeMetaLeaderChangeIT extends
AbstractPipeDualManualIT {
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
.setSchemaReplicationFactor(3);
+ // 10 min, assert that the operations will not time out
+ senderEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(600000);
+
receiverEnv.getConfig().getConfigNodeConfig().setConnectionTimeoutMs(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 cadac3cc7a3..c03c0b499b5 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
@@ -34,6 +34,8 @@ abstract class AbstractPipeSingleIT {
MultiEnvFactory.createEnv(2);
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.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 d8ee2ecaf24..ecad24e2b4b 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
@@ -40,6 +40,10 @@ abstract class AbstractSubscriptionDualIT {
receiverEnv.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
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.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
}
