You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/10/14 07:31:19 UTC

[iotdb] branch master updated: [IOTDB-4648] Fix bug ConsensusManager won't initialize when restart

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

caogaofei 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 5fb78ab80e [IOTDB-4648] Fix bug ConsensusManager won't initialize when restart
5fb78ab80e is described below

commit 5fb78ab80e2fc547ec7e1dcbfb1ef6fe7fa9a769
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Fri Oct 14 15:31:11 2022 +0800

    [IOTDB-4648] Fix bug ConsensusManager won't initialize when restart
---
 .../java/org/apache/iotdb/confignode/manager/ConsensusManager.java    | 4 ++--
 .../src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 99dd15d077..f51c1ddd81 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -57,12 +57,12 @@ public class ConsensusManager {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
   private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
+  private static final int SEED_CONFIG_NODE_Id = 0;
 
   private final IManager configManager;
 
   private ConsensusGroupId consensusGroupId;
   private IConsensus consensusImpl;
-  private final int seedConfigNodeId = 0;
 
   public ConsensusManager(IManager configManager, PartitionRegionStateMachine stateMachine)
       throws IOException {
@@ -152,7 +152,7 @@ public class ConsensusManager {
       createPeerForConsensusGroup(
           Collections.singletonList(
               new TConfigNodeLocation(
-                  seedConfigNodeId,
+                  SEED_CONFIG_NODE_Id,
                   new TEndPoint(CONF.getInternalAddress(), CONF.getInternalPort()),
                   new TEndPoint(CONF.getInternalAddress(), CONF.getConsensusPort()))));
     }
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 501bd7b5e1..fb26ccc4f9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -87,6 +87,7 @@ public class ConfigNode implements ConfigNodeMBean {
 
       /* Restart */
       if (SystemPropertiesUtils.isRestarted()) {
+        configManager.initConsensusManager();
         setUpRPCService();
         LOGGER.info(
             "{} has successfully started and joined the cluster.", ConfigNodeConstant.GLOBAL_NAME);