[iotdb] branch cluster_scalability updated: fix bugs of checking params

[lta]

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

lta pushed a commit to branch cluster_scalability
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/cluster_scalability by this 
push:
     new b3815ea  fix bugs of checking params
b3815ea is described below

commit b3815ea65c0a4747f19ec662fab4a5d032e5004b
Author: lta <litiana...@163.com>
AuthorDate: Thu May 6 12:06:49 2021 +0800

    fix bugs of checking params
---
 cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java    | 4 +++-
 .../org/apache/iotdb/cluster/server/member/MetaGroupMember.java    | 4 ++--
 .../src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java | 7 +------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
index 4d2d176..b928208 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
@@ -49,6 +49,8 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.apache.iotdb.cluster.utils.ClusterUtils.UNKNOWN_CLIENT_IP;
+
 public class ClusterMain {
 
   private static final Logger logger = 
LoggerFactory.getLogger(ClusterMain.class);
@@ -217,7 +219,7 @@ public class ClusterMain {
     TProtocolFactory factory =
         config.isRpcThriftCompressionEnabled() ? new 
TCompactProtocol.Factory() : new Factory();
     Node nodeToRemove = new Node();
-    nodeToRemove.setInternalIp(ip).setMetaPort(metaPort);
+    
nodeToRemove.setInternalIp(ip).setMetaPort(metaPort).setClientIp(UNKNOWN_CLIENT_IP);
     // try sending the request to each seed node
     for (String url : config.getSeedNodeUrls()) {
       Node node = ClusterUtils.parseNode(url);
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index f9f885c..01ecfe8 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -1029,7 +1029,7 @@ public class MetaGroupMember extends RaftMember {
 
     int retryTime = 0;
     while (true) {
-      logger.info("{} Send empty content log to other nodes, retry time: {}", 
name, retryTime);
+      logger.debug("{} Send empty content log to other nodes, retry time: {}", 
name, retryTime);
       AppendLogResult result = sendLogToFollowers(log);
       switch (result) {
         case OK:
@@ -1040,7 +1040,7 @@ public class MetaGroupMember extends RaftMember {
           }
           return;
         case TIME_OUT:
-          logger.info("{}: add empty content log timed out, retry.", name);
+          logger.debug("{}: add empty content log timed out, retry.", name);
           try {
             Thread.sleep(ClusterConstant.RETRY_WAIT_TIME_MS);
           } catch (InterruptedException e) {
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java 
b/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java
index af5af74..9333287 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterUtils.java
@@ -182,12 +182,7 @@ public class ClusterUtils {
     if (ipCompare != 0) {
       return ipCompare;
     } else {
-      int metaPortCompare = thisSeedNode.getMetaPort() - 
thatSeedNode.getMetaPort();
-      if (metaPortCompare != 0) {
-        return metaPortCompare;
-      } else {
-        return thisSeedNode.getDataPort() - thatSeedNode.getDataPort();
-      }
+      return thisSeedNode.getMetaPort() - thatSeedNode.getMetaPort();
     }
   }