You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2025/04/02 09:46:09 UTC

(iotdb) branch dev/1.3 updated: [To dev/1.3] Enhance remove confignode robustness by increase waiting time for new leader #15262

This is an automated email from the ASF dual-hosted git repository.

tanxinyu 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 4b94ccf4fbb [To dev/1.3] Enhance remove confignode robustness by increase waiting time for new leader #15262
4b94ccf4fbb is described below

commit 4b94ccf4fbba183fd68cf0568cdfac905d514679
Author: Potato <ta...@apache.org>
AuthorDate: Wed Apr 2 17:46:04 2025 +0800

    [To dev/1.3] Enhance remove confignode robustness by increase waiting time for new leader #15262
    
    Signed-off-by: OneSizeFitQuorum <ta...@apache.org>
---
 .../java/org/apache/iotdb/confignode/manager/node/NodeManager.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 405ad39d4ad..8925375d573 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
@@ -69,7 +69,6 @@ import org.apache.iotdb.confignode.manager.UDFManager;
 import org.apache.iotdb.confignode.manager.consensus.ConsensusManager;
 import org.apache.iotdb.confignode.manager.load.LoadManager;
 import org.apache.iotdb.confignode.manager.load.cache.node.ConfigNodeHeartbeatCache;
-import org.apache.iotdb.confignode.manager.load.service.StatisticsService;
 import org.apache.iotdb.confignode.manager.partition.PartitionManager;
 import org.apache.iotdb.confignode.manager.partition.PartitionMetrics;
 import org.apache.iotdb.confignode.manager.pipe.coordinator.PipeManager;
@@ -802,8 +801,7 @@ public class NodeManager {
       final long deadline =
           System.nanoTime()
               + TimeUnit.MILLISECONDS.toNanos(
-                  (CONF.getHeartbeatIntervalInMs() + StatisticsService.STATISTICS_UPDATE_INTERVAL)
-                      * 3);
+                  CommonDescriptor.getInstance().getConfig().getDnConnectionTimeoutInMS() / 2);
       while (filterConfigNodeThroughStatus(NodeStatus.Running).size() <= 1) {
         if (System.nanoTime() > deadline) {
           return new TSStatus(TSStatusCode.REMOVE_CONFIGNODE_ERROR.getStatusCode())