This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 75b30407702 Common Config & Pipe IT: Fixed the bug that
dn-connection-timeout and cn-connection-timeout are mixed (#14275) (#14303)
75b30407702 is described below
commit 75b304077023738974a13f7a02269e1f71540b35
Author: Caideyipi <[email protected]>
AuthorDate: Wed Dec 4 15:06:44 2024 +0800
Common Config & Pipe IT: Fixed the bug that dn-connection-timeout and
cn-connection-timeout are mixed (#14275) (#14303)
---
.../it/env/cluster/config/MppCommonConfig.java | 4 ++--
.../env/cluster/config/MppSharedCommonConfig.java | 6 +++---
.../it/env/remote/config/RemoteCommonConfig.java | 2 +-
.../org/apache/iotdb/itbase/env/CommonConfig.java | 2 +-
.../pipe/it/autocreate/AbstractPipeDualAutoIT.java | 4 ++--
.../it/autocreate/IoTDBPipeAutoConflictIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeClusterIT.java | 4 ++--
.../IoTDBPipeConnectorCompressionIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeExtractorIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeIdempotentIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeProcessorIT.java | 4 ++--
.../pipe/it/autocreate/IoTDBPipeProtocolIT.java | 12 ++++++------
.../pipe/it/autocreate/IoTDBPipeWithLoadIT.java | 4 ++--
.../pipe/it/manual/AbstractPipeDualManualIT.java | 4 ++--
.../pipe/it/manual/IoTDBPipeMetaHistoricalIT.java | 4 ++--
.../it/manual/IoTDBPipeMetaLeaderChangeIT.java | 4 ++--
.../pipe/it/manual/IoTDBPipePermissionIT.java | 4 ++--
.../iotdb/pipe/it/single/AbstractPipeSingleIT.java | 2 +-
.../it/dual/AbstractSubscriptionDualIT.java | 4 ++--
.../it/triple/AbstractSubscriptionTripleIT.java | 6 +++---
.../iotdb/confignode/manager/ConfigManager.java | 2 +-
.../iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../manager/consensus/ConsensusManager.java | 6 +++---
.../manager/node/ClusterNodeStartUtils.java | 2 +-
.../iotdb/confignode/manager/node/NodeManager.java | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 2 +-
.../protocol/legacy/IoTDBLegacyPipeConnector.java | 2 +-
.../iotdb/commons/client/ClientPoolFactory.java | 22 +++++++++++-----------
.../client/request/TestConnectionUtils.java | 6 +++---
.../apache/iotdb/commons/conf/CommonConfig.java | 21 ++++++++++++++++-----
.../iotdb/commons/conf/CommonDescriptor.java | 8 ++++----
31 files changed, 86 insertions(+), 75 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 1760301ac73..513c8f6ff8b 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
@@ -443,8 +443,8 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
}
@Override
- public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
- setProperty("cn_connection_timeout_ms",
String.valueOf(connectionTimeoutMs));
+ public CommonConfig setDnConnectionTimeoutMs(int connectionTimeoutMs) {
+ setProperty("dn_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 969d4bb8d41..6e0115fc4e2 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
@@ -453,9 +453,9 @@ public class MppSharedCommonConfig implements CommonConfig {
}
@Override
- public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
- dnConfig.setCnConnectionTimeoutMs(connectionTimeoutMs);
- cnConfig.setCnConnectionTimeoutMs(connectionTimeoutMs);
+ public CommonConfig setDnConnectionTimeoutMs(int connectionTimeoutMs) {
+ dnConfig.setDnConnectionTimeoutMs(connectionTimeoutMs);
+ cnConfig.setDnConnectionTimeoutMs(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 cee8aadf05f..25489a42d14 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
@@ -319,7 +319,7 @@ public class RemoteCommonConfig implements CommonConfig {
}
@Override
- public CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs) {
+ public CommonConfig setDnConnectionTimeoutMs(int 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 d806be8db1d..f08c93089cf 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
@@ -142,7 +142,7 @@ public interface CommonConfig {
CommonConfig setTagAttributeTotalSize(int tagAttributeTotalSize);
- CommonConfig setCnConnectionTimeoutMs(int connectionTimeoutMs);
+ CommonConfig setDnConnectionTimeoutMs(int connectionTimeoutMs);
CommonConfig setPipeHeartbeatIntervalSecondsForCollectingPipeMeta(
int pipeHeartbeatIntervalSecondsForCollectingPipeMeta);
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 f2d3ec8cf6e..1817efdaa1d 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
@@ -57,8 +57,8 @@ abstract class AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
}
@After
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
index a33e0403a28..3326b7b7ef1 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
@@ -69,8 +69,8 @@ public class IoTDBPipeAutoConflictIT extends
AbstractPipeDualAutoIT {
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 a017cf112d7..0d4fc3eea7e 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 f7c0c63b842..97213150069 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
@@ -76,8 +76,8 @@ public class IoTDBPipeConnectorCompressionIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java
index aea757e63b3..0b4636c0d13 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeExtractorIT.java
@@ -80,8 +80,8 @@ public class IoTDBPipeExtractorIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 fab2ef9597a..696792936ff 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 4556416f5fb..27bc5be9659 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 328e1af5fd7..c5d41f001cb 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(1, 1);
receiverEnv.initClusterEnvironment(1, 3);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java
index 45e40331b38..563377c927e 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeWithLoadIT.java
@@ -70,8 +70,8 @@ public class IoTDBPipeWithLoadIT extends
AbstractPipeDualAutoIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment();
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 cdca06025fe..3e9f5111165 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
@@ -57,8 +57,8 @@ abstract class AbstractPipeDualManualIT {
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
}
@After
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 2ce13afbf72..ccaf4bc24b5 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 de386f7f3dc..c03f56bad4e 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment(3, 3, 180);
receiverEnv.initClusterEnvironment();
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java
index a7e935a7548..e243c2e7bf8 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipePermissionIT.java
@@ -76,8 +76,8 @@ public class IoTDBPipePermissionIT extends
AbstractPipeDualManualIT {
.setDataReplicationFactor(2);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
senderEnv.initClusterEnvironment();
receiverEnv.initClusterEnvironment(3, 3);
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 70bb4df4a93..4c513576488 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().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ env.getConfig().getCommonConfig().setDnConnectionTimeoutMs(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 5c4fc94a7c3..27d8c3c493f 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
@@ -52,8 +52,8 @@ public abstract class AbstractSubscriptionDualIT extends
AbstractSubscriptionIT
receiverEnv.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
// 10 min, assert that the operations will not time out
- senderEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiverEnv.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
}
@Override
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
index 5f607a25968..9622f727908 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
@@ -61,9 +61,9 @@ public abstract class AbstractSubscriptionTripleIT extends
AbstractSubscriptionI
receiver2.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
// 10 min, assert that the operations will not time out
- sender.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiver1.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
- receiver2.getConfig().getCommonConfig().setCnConnectionTimeoutMs(600000);
+ sender.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiver1.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
+ receiver2.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
}
@Override
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 3bfd6e4f240..e83b56aaeb8 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -1379,7 +1379,7 @@ public class ConfigManager implements IManager {
@Override
public TSStatus createPeerForConsensusGroup(List<TConfigNodeLocation>
configNodeLocations) {
- final long rpcTimeoutInMS = COMMON_CONF.getConnectionTimeoutInMS();
+ final long rpcTimeoutInMS = COMMON_CONF.getCnConnectionTimeoutInMS();
final long retryIntervalInMS = 1000;
for (int i = 0; i < rpcTimeoutInMS / retryIntervalInMS; i++) {
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index 85e4d85e2d7..5f70ced73a5 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -147,7 +147,7 @@ public class ProcedureManager {
ConfigNodeDescriptor.getInstance().getConf();
private static final CommonConfig COMMON_CONFIG =
CommonDescriptor.getInstance().getConfig();
- public static final long PROCEDURE_WAIT_TIME_OUT =
COMMON_CONFIG.getConnectionTimeoutInMS();
+ public static final long PROCEDURE_WAIT_TIME_OUT =
COMMON_CONFIG.getDnConnectionTimeoutInMS();
private static final int PROCEDURE_WAIT_RETRY_TIMEOUT = 10;
private static final String PROCEDURE_TIMEOUT_MESSAGE =
"Timed out to wait for procedure return. The procedure is still
running.";
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
index a339b461047..e5e3473eedf 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
@@ -68,7 +68,7 @@ public class ConsensusManager {
private static final CommonConfig COMMON_CONF =
CommonDescriptor.getInstance().getConfig();
private static final int SEED_CONFIG_NODE_ID = 0;
private static final long MAX_WAIT_READY_TIME_MS =
- CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS() /
2;
+ CommonDescriptor.getInstance().getConfig().getCnConnectionTimeoutInMS()
/ 2;
private static final long RETRY_WAIT_TIME_MS = 100;
/** There is only one ConfigNodeGroup */
@@ -218,14 +218,14 @@ public class ConsensusManager {
CONF.getConfigNodeRatisPeriodicSnapshotInterval())
.setRetryTimesMax(10)
.setRetryWaitMillis(
-
COMMON_CONF.getConnectionTimeoutInMS() / 10)
+
COMMON_CONF.getCnConnectionTimeoutInMS() / 10)
.build())
.setRead(
RatisConfig.Read.newBuilder()
// use thrift connection timeout to
unify read timeout
.setReadTimeout(
TimeDuration.valueOf(
-
COMMON_CONF.getConnectionTimeoutInMS(),
+
COMMON_CONF.getCnConnectionTimeoutInMS(),
TimeUnit.MILLISECONDS))
.build())
.build())
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
index 4f00eefb825..60c806db328 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
@@ -104,7 +104,7 @@ public class ClusterNodeStartUtils {
configManager
.getClusterManager()
.getClusterIdWithRetry(
-
CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS() / 2);
+
CommonDescriptor.getInstance().getConfig().getCnConnectionTimeoutInMS() / 2);
if (clusterId == null) {
status
.setCode(TSStatusCode.GET_CLUSTER_ID_ERROR.getStatusCode())
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index ada9262de54..af9fc283d07 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -325,7 +325,7 @@ public class NodeManager {
configManager
.getClusterManager()
.getClusterIdWithRetry(
-
CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS() / 2);
+
CommonDescriptor.getInstance().getConfig().getCnConnectionTimeoutInMS() / 2);
TDataNodeRestartResp resp = new TDataNodeRestartResp();
resp.setConfigNodeList(getRegisteredConfigNodes());
if (clusterId == null) {
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 4b9daca9f55..8b28afcf1cb 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -90,7 +90,7 @@ public class ConfigNode extends ServerCommandLine implements
ConfigNodeMBean {
private static final int STARTUP_RETRY_NUM = 10;
private static final long STARTUP_RETRY_INTERVAL_IN_MS =
TimeUnit.SECONDS.toMillis(3);
private static final int SCHEDULE_WAITING_RETRY_NUM =
- (int) (COMMON_CONFIG.getConnectionTimeoutInMS() /
STARTUP_RETRY_INTERVAL_IN_MS);
+ (int) (COMMON_CONFIG.getCnConnectionTimeoutInMS() /
STARTUP_RETRY_INTERVAL_IN_MS);
private static final int SEED_CONFIG_NODE_ID = 0;
private static final int INIT_NON_SEED_CONFIG_NODE_ID = -1;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
index ef05f8f30a8..58a929d30d0 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/legacy/IoTDBLegacyPipeConnector.java
@@ -227,7 +227,7 @@ public class IoTDBLegacyPipeConnector implements
PipeConnector {
client =
new IoTDBSyncClient(
new ThriftClientProperty.Builder()
-
.setConnectionTimeoutMs(COMMON_CONFIG.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(COMMON_CONFIG.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(COMMON_CONFIG.isRpcThriftCompressionEnabled())
.build(),
ipAddress,
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
index 05e67ae7fa1..169c07d59d9 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
@@ -59,7 +59,7 @@ public class ClientPoolFactory {
new SyncConfigNodeIServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.build()),
new
ClientPoolProperty.Builder<SyncConfigNodeIServiceClient>().build().getConfig());
@@ -80,7 +80,7 @@ public class ClientPoolFactory {
new AsyncConfigNodeInternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.build(),
@@ -105,7 +105,7 @@ public class ClientPoolFactory {
new SyncDataNodeInternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.build()),
new
ClientPoolProperty.Builder<SyncDataNodeInternalServiceClient>()
@@ -128,7 +128,7 @@ public class ClientPoolFactory {
new AsyncDataNodeInternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.build(),
@@ -153,7 +153,7 @@ public class ClientPoolFactory {
new AsyncDataNodeExternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.build(),
@@ -179,7 +179,7 @@ public class ClientPoolFactory {
new AsyncConfigNodeInternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.setPrintLogWhenEncounterException(false)
@@ -204,7 +204,7 @@ public class ClientPoolFactory {
new AsyncDataNodeInternalServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.setPrintLogWhenEncounterException(false)
@@ -231,7 +231,7 @@ public class ClientPoolFactory {
new SyncDataNodeMPPDataExchangeServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.build()),
new
ClientPoolProperty.Builder<SyncDataNodeMPPDataExchangeServiceClient>()
@@ -255,7 +255,7 @@ public class ClientPoolFactory {
new AsyncDataNodeMPPDataExchangeServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.build(),
@@ -307,7 +307,7 @@ public class ClientPoolFactory {
new AsyncAINodeServiceClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getCnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager())
.setPrintLogWhenEncounterException(false)
@@ -334,7 +334,7 @@ public class ClientPoolFactory {
new AINodeClient.Factory(
manager,
new ThriftClientProperty.Builder()
- .setConnectionTimeoutMs(conf.getConnectionTimeoutInMS())
+
.setConnectionTimeoutMs(conf.getDnConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled())
.build()),
new ClientPoolProperty.Builder<AINodeClient>()
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/request/TestConnectionUtils.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/request/TestConnectionUtils.java
index 99590df4542..310c74e60a1 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/request/TestConnectionUtils.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/client/request/TestConnectionUtils.java
@@ -37,9 +37,9 @@ import java.util.stream.Collectors;
public class TestConnectionUtils {
private static int dataNodeServiceRequestTimeout =
- CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS();
+ CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS();
private static int configNodeServiceRequestTimeout =
- CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS();
+ CommonDescriptor.getInstance().getConfig().getCnConnectionTimeoutInMS();
public static <ServiceProviderLocation, RequestType>
List<TTestConnectionResult> testConnectionsImpl(
@@ -108,6 +108,6 @@ public class TestConnectionUtils {
public static int calculateDnToCnLeaderMaxTime() {
return calculateCnLeaderToAllDnMaxTime()
- +
CommonDescriptor.getInstance().getConfig().getConnectionTimeoutInMS();
+ +
CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS();
}
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index cf9fd879f2b..0282da49a5b 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -132,7 +132,10 @@ public class CommonConfig {
private int ttlRuleCapacity = 1000;
/** Thrift socket and connection timeout between data node and config node.
*/
- private int connectionTimeoutInMS = (int) TimeUnit.SECONDS.toMillis(60);
+ private int cnConnectionTimeoutInMS = (int) TimeUnit.SECONDS.toMillis(60);
+
+ /** Thrift socket and connection timeout between data node and config node.
*/
+ private int dnConnectionTimeoutInMS = (int) TimeUnit.SECONDS.toMillis(60);
/**
* ClientManager will have so many selector threads (TAsyncClientManager) to
distribute to its
@@ -475,12 +478,20 @@ public class CommonConfig {
this.ttlRuleCapacity = ttlRuleCapacity;
}
- public int getConnectionTimeoutInMS() {
- return connectionTimeoutInMS;
+ public int getCnConnectionTimeoutInMS() {
+ return cnConnectionTimeoutInMS;
+ }
+
+ public void setCnConnectionTimeoutInMS(int cnConnectionTimeoutInMS) {
+ this.cnConnectionTimeoutInMS = cnConnectionTimeoutInMS;
+ }
+
+ public int getDnConnectionTimeoutInMS() {
+ return dnConnectionTimeoutInMS;
}
- public void setConnectionTimeoutInMS(int connectionTimeoutInMS) {
- this.connectionTimeoutInMS = connectionTimeoutInMS;
+ public void setDnConnectionTimeoutInMS(int dnConnectionTimeoutInMS) {
+ this.dnConnectionTimeoutInMS = dnConnectionTimeoutInMS;
}
public int getSelectorNumOfClientManager() {
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
index dff60d3e100..618e5878c21 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
@@ -121,11 +121,11 @@ public class CommonDescriptor {
String.valueOf(config.isRpcThriftCompressionEnabled()))
.trim()));
- config.setConnectionTimeoutInMS(
+ config.setCnConnectionTimeoutInMS(
Integer.parseInt(
properties
.getProperty(
- "cn_connection_timeout_ms",
String.valueOf(config.getConnectionTimeoutInMS()))
+ "cn_connection_timeout_ms",
String.valueOf(config.getCnConnectionTimeoutInMS()))
.trim()));
config.setSelectorNumOfClientManager(
@@ -144,11 +144,11 @@ public class CommonDescriptor {
String.valueOf(config.getMaxClientNumForEachNode()))
.trim()));
- config.setConnectionTimeoutInMS(
+ config.setDnConnectionTimeoutInMS(
Integer.parseInt(
properties
.getProperty(
- "dn_connection_timeout_ms",
String.valueOf(config.getConnectionTimeoutInMS()))
+ "dn_connection_timeout_ms",
String.valueOf(config.getDnConnectionTimeoutInMS()))
.trim()));
config.setRpcThriftCompressionEnabled(
