You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/12/14 10:46:52 UTC
[iotdb] branch change_rpc_port updated: remove cluster_rpc_ip
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch change_rpc_port
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/change_rpc_port by this push:
new 0bf54ae remove cluster_rpc_ip
0bf54ae is described below
commit 0bf54aec5df8c3314b417fc13c9468193c08587b
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Dec 14 18:46:20 2020 +0800
remove cluster_rpc_ip
---
.../assembly/resources/conf/iotdb-cluster.properties | 2 --
.../java/org/apache/iotdb/cluster/ClusterMain.java | 12 ++++++------
.../apache/iotdb/cluster/config/ClusterConfig.java | 11 +----------
.../iotdb/cluster/config/ClusterDescriptor.java | 19 +++++--------------
.../org/apache/iotdb/cluster/server/ClientServer.java | 2 +-
.../org/apache/iotdb/cluster/server/RaftServer.java | 2 +-
.../cluster/server/heartbeat/DataHeartbeatServer.java | 4 ++--
.../cluster/server/heartbeat/HeartbeatServer.java | 2 +-
.../cluster/server/heartbeat/MetaHeartbeatServer.java | 4 ++--
9 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/cluster/src/assembly/resources/conf/iotdb-cluster.properties b/cluster/src/assembly/resources/conf/iotdb-cluster.properties
index f111a5f..82ec45d 100644
--- a/cluster/src/assembly/resources/conf/iotdb-cluster.properties
+++ b/cluster/src/assembly/resources/conf/iotdb-cluster.properties
@@ -17,8 +17,6 @@
# under the License.
#
-cluster_rpc_ip=127.0.0.1
-
#-------------------------------------------IMPORTANT---------------------------------------------#
# Note that the system will automatically create a heartbeat port for each metadata service #
# and data service. The default metadata heartbeat port is internal_meta_port + 1, #
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 af17646..3c54165 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java
@@ -171,7 +171,7 @@ public class ClusterMain {
}
// assert this node is in NodeList
Node localNode = new Node();
- localNode.setIp(config.getClusterRpcIp()).setMetaPort(config.getInternalMetaPort())
+ localNode.setIp(IoTDBDescriptor.getInstance().getConfig().getRpcAddress()).setMetaPort(config.getInternalMetaPort())
.setDataPort(config.getInternalDataPort()).setClientPort(config.getClusterRpcPort());
if (!seedNodes.contains(localNode)) {
String message = String.format(
@@ -194,18 +194,18 @@ public class ClusterMain {
}
// 1. check the cluster_rpc_ip and seed_nodes consistent or not
- // when clusterRpcIp is 127.0.0.1, the entire cluster must be start locally
+ // when rpc_address is 127.0.0.1, the entire cluster must be start locally
ClusterConfig config = ClusterDescriptor.getInstance().getConfig();
String localhostIp = "127.0.0.1";
- String configClusterRpcIp = config.getClusterRpcIp();
+ String rpcIp = IoTDBDescriptor.getInstance().getConfig().getRpcAddress();
List<String> seedNodes = config.getSeedNodeUrls();
- boolean isLocalCluster = localhostIp.equals(configClusterRpcIp);
+ boolean isLocalCluster = localhostIp.equals(rpcIp);
for (String seedNodeIP : seedNodes) {
if ((isLocalCluster && !seedNodeIP.contains(localhostIp)) ||
(!isLocalCluster && seedNodeIP.contains(localhostIp))) {
logger.error(
- "cluster_rpc_ip={} and seed_nodes={} should be consistent, both use local ip or real ip please",
- configClusterRpcIp, seedNodes);
+ "rpc_ip={} and seed_nodes={} should be consistent, both use local ip or real ip please",
+ rpcIp, seedNodes);
return false;
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
index 0055b9f..bb0fc2c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
@@ -26,7 +26,6 @@ public class ClusterConfig {
static final String CONFIG_NAME = "iotdb-cluster.properties";
- private String clusterRpcIp = "127.0.0.1";
private String internalIp = "127.0.0.1";
private int internalMetaPort = 9003;
private int internalDataPort = 40010;
@@ -185,15 +184,7 @@ public class ClusterConfig {
public void setUseBatchInLogCatchUp(boolean useBatchInLogCatchUp) {
this.useBatchInLogCatchUp = useBatchInLogCatchUp;
}
-
- public String getClusterRpcIp() {
- return clusterRpcIp;
- }
-
- void setClusterRpcIp(String clusterRpcIp) {
- this.clusterRpcIp = clusterRpcIp;
- }
-
+
public int getInternalMetaPort() {
return internalMetaPort;
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
index f465a94..b554b85 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
@@ -30,12 +30,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.apache.iotdb.cluster.exception.BadSeedUrlFormatException;
import org.apache.iotdb.db.conf.IoTDBConstant;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,16 +77,11 @@ public class ClusterDescriptor {
}
public void replaceHostnameWithIp() throws UnknownHostException, BadSeedUrlFormatException {
- boolean isInvalidClusterRpcIp = InetAddresses.isInetAddress(config.getClusterRpcIp());
- if (!isInvalidClusterRpcIp) {
- String clusterRpcIp = hostnameToIP(config.getClusterRpcIp());
- config.setClusterRpcIp(clusterRpcIp);
- }
+
boolean isInvalidClusterInternalIp = InetAddresses.isInetAddress(config.getInternalIp());
if (!isInvalidClusterInternalIp) {
- config.setClusterRpcIp(hostnameToIP(config.getInternalIp()));
+ config.setInternalIp(hostnameToIP(config.getInternalIp()));
}
-
List<String> newSeedUrls = new ArrayList<>();
for (String seedUrl : config.getSeedNodeUrls()) {
String[] splits = seedUrl.split(":");
@@ -106,8 +98,8 @@ public class ClusterDescriptor {
}
}
config.setSeedNodeUrls(newSeedUrls);
- logger.debug("after replace, the clusterRpcIP={}, internalIP={} seedUrls={}",
- config.getClusterRpcIp(),
+ logger.debug("after replace, the rpcIP={}, internalIP={} seedUrls={}",
+ IoTDBDescriptor.getInstance().getConfig().getRpcAddress(),
config.getInternalIp(),
config.getSeedNodeUrls());
}
@@ -127,7 +119,6 @@ public class ClusterDescriptor {
logger.warn("Fail to find config file {}", url, e);
}
}
- config.setClusterRpcIp(properties.getProperty("cluster_rpc_ip", config.getClusterRpcIp()));
config.setInternalIp(properties.getProperty("internal_ip", config.getInternalIp()));
config.setInternalMetaPort(Integer.parseInt(properties.getProperty("internal_meta_port",
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClientServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClientServer.java
index f0c554e..957befa 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClientServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClientServer.java
@@ -141,7 +141,7 @@ public class ClientServer extends TSServiceImpl {
} else {
protocolFactory = new TBinaryProtocol.Factory();
}
- serverTransport = new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(),
+ serverTransport = new TServerSocket(new InetSocketAddress(IoTDBDescriptor.getInstance().getConfig().getRpcAddress(),
config.getClusterRpcPort()));
// async service also requires nonblocking server, and HsHaServer is basically more efficient a
// nonblocking server
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
index 8c90a6c..b16efb5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/RaftServer.java
@@ -78,7 +78,7 @@ public abstract class RaftServer implements RaftService.AsyncIface, RaftService.
RaftServer() {
thisNode = new Node();
- thisNode.setIp(config.getClusterRpcIp());
+ thisNode.setIp(config.getInternalIp());
thisNode.setMetaPort(config.getInternalMetaPort());
thisNode.setDataPort(config.getInternalDataPort());
thisNode.setClientPort(config.getClusterRpcPort());
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java
index 366e7b6..477c4b3 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatServer.java
@@ -61,11 +61,11 @@ public class DataHeartbeatServer extends HeartbeatServer {
@Override
TServerTransport getHeartbeatServerSocket() throws TTransportException {
if (ClusterDescriptor.getInstance().getConfig().isUseAsyncServer()) {
- return new TNonblockingServerSocket(new InetSocketAddress(config.getClusterRpcIp(),
+ return new TNonblockingServerSocket(new InetSocketAddress(config.getInternalIp(),
thisNode.getDataPort() + ClusterUtils.DATA_HEARTBEAT_PORT_OFFSET),
getConnectionTimeoutInMS());
} else {
- return new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(),
+ return new TServerSocket(new InetSocketAddress(config.getInternalIp(),
thisNode.getDataPort() + ClusterUtils.DATA_HEARTBEAT_PORT_OFFSET));
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatServer.java
index ce59c0b..3341bef 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatServer.java
@@ -78,7 +78,7 @@ public abstract class HeartbeatServer {
HeartbeatServer() {
thisNode = new Node();
- thisNode.setIp(config.getClusterRpcIp());
+ thisNode.setIp(config.getInternalIp());
thisNode.setMetaPort(config.getInternalMetaPort());
thisNode.setDataPort(config.getInternalDataPort());
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java
index 43a54ad..1c3aace 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatServer.java
@@ -67,11 +67,11 @@ public class MetaHeartbeatServer extends HeartbeatServer {
logger.info("[{}] Cluster node will listen {}:{}", getServerClientName(), config.getInternalIp(),
config.getInternalMetaPort() + ClusterUtils.META_HEARTBEAT_PORT_OFFSET);
if (ClusterDescriptor.getInstance().getConfig().isUseAsyncServer()) {
- return new TNonblockingServerSocket(new InetSocketAddress(config.getClusterRpcIp(),
+ return new TNonblockingServerSocket(new InetSocketAddress(config.getInternalIp(),
config.getInternalMetaPort() + ClusterUtils.META_HEARTBEAT_PORT_OFFSET),
getConnectionTimeoutInMS());
} else {
- return new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(),
+ return new TServerSocket(new InetSocketAddress(config.getInternalIp(),
config.getInternalMetaPort() + ClusterUtils.META_HEARTBEAT_PORT_OFFSET));
}
}