[iotdb] branch master updated: Fix remove config node bug (#6679)

[caogaofei]

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 134963f9b0 Fix remove config node bug (#6679)
134963f9b0 is described below

commit 134963f9b0c11a6259b5c088ddf5216c348692c0
Author: wangchao316 <66939405+wangchao...@users.noreply.github.com>
AuthorDate: Fri Jul 15 16:55:32 2022 +0800

    Fix remove config node bug (#6679)
---
 .../org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java   | 8 +++-----
 .../confignode/service/thrift/ConfigNodeRPCServiceProcessor.java  | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
index 841e224ca7..cc53114cb1 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeRemoveCheck.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
 import org.apache.iotdb.common.rpc.thrift.TSStatus;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.exception.BadNodeUrlException;
-import org.apache.iotdb.commons.utils.NodeUrlUtils;
 import org.apache.iotdb.confignode.client.ConfigNodeRequestType;
 import org.apache.iotdb.confignode.client.SyncConfigNodeClientPool;
 import org.apache.iotdb.rpc.TSStatusCode;
@@ -92,10 +91,9 @@ public class ConfigNodeRemoveCheck {
     }
   }
 
-  /** target_config_nodes of confignode-system.properties */
-  public List<TConfigNodeLocation> getConfigNodeList() throws 
BadNodeUrlException {
-    return NodeUrlUtils.parseTConfigNodeUrls(
-        systemProperties.getProperty(IoTDBConstant.TARGET_CONFIG_NODES));
+  /** config_node_list of confignode-system.properties */
+  public List<TConfigNodeLocation> getConfigNodeList() throws 
BadNodeUrlException, IOException {
+    return SystemPropertiesUtils.loadConfigNodeList();
   }
 
   public int getConsensusPort() {
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index f61f411619..118c98a2ec 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -493,9 +493,10 @@ public class ConfigNodeRPCServiceProcessor implements 
IConfigNodeRPCService.Ifac
             () -> {
               try {
                 ConfigNode.getInstance().stop();
-                System.exit(0);
               } catch (IOException e) {
                 LOGGER.error("Meet error when stop ConfigNode!", e);
+              } finally {
+                System.exit(0);
               }
             })
         .start();