fix confignode restart

Signed-off-by: OneSizeFitQuorum <tanxinyu@apache.org>
apache · May 21, 2024 · 82a00fa · 82a00fa
1 parent 6a0a23d
commit 82a00fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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
@@ -1280,7 +1280,7 @@ public TSStatus createPeerForConsensusGroup(List<TConfigNodeLocation> configNode
 
     for (int i = 0; i < rpcTimeoutInMS / retryIntervalInMS; i++) {
       try {
-        if (consensusManager.get() == null) {
+        if (consensusManager.get() == null || !consensusManager.get().isInitialized()) {
           TimeUnit.MILLISECONDS.sleep(retryIntervalInMS);
         } else {
           // When add non Seed-ConfigNode to the ConfigNodeGroup, the parameter should be emptyList

diff --git a/...fignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java b/...fignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
@@ -77,6 +77,8 @@ public class ConsensusManager {
   private final IManager configManager;
   private IConsensus consensusImpl;
 
+  private boolean isInitialized;
+
   public ConsensusManager(IManager configManager, ConfigRegionStateMachine stateMachine) {
     this.configManager = configManager;
     setConsensusLayer(stateMachine);
@@ -101,6 +103,7 @@ public void start() throws IOException {
             "Something wrong happened while calling consensus layer's createLocalPeer API.", e);
       }
     }
+    isInitialized = true;
   }
 
   public void close() throws IOException {
@@ -444,4 +447,8 @@ private NodeManager getNodeManager() {
   public void manuallyTakeSnapshot() throws ConsensusException {
     consensusImpl.triggerSnapshot(ConfigNodeInfo.CONFIG_REGION_ID, true);
   }
+
+  public boolean isInitialized() {
+    return isInitialized;
+  }
 }