This is an automated email from the ASF dual-hosted git repository. yuyuankang pushed a commit to branch kyy2 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 94ac16c3a885c07ca1e9927311ec24f73ee6c42e Author: Ring-k <[email protected]> AuthorDate: Fri Jul 17 14:34:18 2020 +0800 rename configs --- .../resources/conf/iotdb-cluster.properties | 30 +++++----- .../java/org/apache/iotdb/cluster/ClusterMain.java | 16 ++--- .../apache/iotdb/cluster/config/ClusterConfig.java | 50 ++++++++-------- .../iotdb/cluster/config/ClusterDescriptor.java | 68 +++++++++++----------- .../serializable/SyncLogDequeSerializer.java | 2 +- .../apache/iotdb/cluster/server/ClientServer.java | 4 +- .../iotdb/cluster/server/DataClusterServer.java | 4 +- .../iotdb/cluster/server/MetaClusterServer.java | 8 +-- .../apache/iotdb/cluster/server/RaftServer.java | 6 +- .../org/apache/iotdb/cluster/common/TestUtils.java | 5 +- 10 files changed, 96 insertions(+), 97 deletions(-) diff --git a/cluster/src/assembly/resources/conf/iotdb-cluster.properties b/cluster/src/assembly/resources/conf/iotdb-cluster.properties index 248a13d..b656542 100644 --- a/cluster/src/assembly/resources/conf/iotdb-cluster.properties +++ b/cluster/src/assembly/resources/conf/iotdb-cluster.properties @@ -17,16 +17,16 @@ # under the License. # -LOCAL_IP=127.0.0.1 +cluster_rpc_ip=127.0.0.1 # port for metadata service -LOCAL_META_PORT=9003 +internal_meta_port=9003 # port for data service -LOCAL_DATA_PORT=40010 +internal_data_port=40010 # port for client service -LOCAL_CLIENT_PORT=55560 +cluster_rpc_port=55560 # comma-separated {IP/DOMAIN}:meta_port:data_port pairs # when used by start-node.sh(.bat), this configuration means the nodes that will form the initial @@ -38,37 +38,37 @@ LOCAL_CLIENT_PORT=55560 # nodes that already in the cluster, unnecessary to be the nodes that were used to build the # initial cluster by start-node.sh(.bat). Several nodes will be picked randomly to send the # request, the number of nodes picked depends on the number of retries. -SEED_NODES=127.0.0.1:9003:40010,127.0.0.1:9004:40011,127.0.0.1:9005:40012 +seed_nodes=127.0.0.1:9003:40010,127.0.0.1:9004:40011,127.0.0.1:9005:40012 # whether to use thrift compressed protocol # WARNING: this must be consistent across all nodes in the cluster -ENABLE_THRIFT_COMPRESSION=true +rpc_thrift_compression_enable=true # max client connections created by thrift # this configuration applies separately to data/meta/client connections and thus does not control # the number of global connections -MAX_CONCURRENT_CLIENT_NUM=10000 +max_concurrent_client_num=10000 # number of replications for one partition -REPLICA_NUM=2 +default_replica_num=2 # connection time out (ms) among raft nodes -CONNECTION_TIME_OUT_MS=20000 +connection_time_out_ms=20000 # when the logs size larger than this, we actually delete snapshoted logs, the unit is bytes -MAX_REMOVED_LOG_SIZE=134217728 +max_unsnapshoted_log_size=134217728 # whether to use batch append entries in log catch up -USE_BATCH_IN_CATCH_UP=true +use_batch_in_catch_up=true # max number of committed logs to be saved -MAX_NUMBER_OF_LOGS=100 +max_number_of_logs=100 # deletion check period of the submitted log -LOG_DELETION_CHECK_INTERVAL_SECOND=60 +log_deletion_check_interval_second=60 # Whether creating schema automatically is enabled, this will replace the one in iotdb-engine.properties -ENABLE_AUTO_CREATE_SCHEMA=true +enable_auto_create_schema=true # consistency level, now three consistency levels are supported: strong, mid and weak. # Strong consistency means the server will first try to synchronize with the leader to get the @@ -76,5 +76,5 @@ ENABLE_AUTO_CREATE_SCHEMA=true # While mid consistency means the server will first try to synchronize with the leader, # but if failed(timeout), it will give up and just use current data it has cached before; # Weak consistency do not synchronize with the leader and simply use the local data -CONSISTENCY_LEVEL=mid +consistency_level=mid 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 1e389b7..5dcfd67 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClusterMain.java @@ -143,18 +143,18 @@ public class ClusterMain { return false; } - // 1. check the LOCAL_IP and SEED_NODES consistent or not + // 1. check the cluster_rpc_ip and seed_nodes consistent or not ClusterConfig config = ClusterDescriptor.getInstance().getConfig(); - String localIP = "127.0.0.1"; - String configLocalIP = config.getLocalIP(); + String clusterRpcIp = "127.0.0.1"; + String configClusterRpcIp = config.getClusterRpcIp(); List<String> seedNodes = config.getSeedNodeUrls(); - boolean isLocalIP = localIP.equals(configLocalIP); + boolean isClusterRpcIp = clusterRpcIp.equals(configClusterRpcIp); for (String seedNodeIP : seedNodes) { - if ((isLocalIP && !seedNodeIP.contains(localIP)) || - (!isLocalIP && seedNodeIP.contains(localIP))) { + if ((isClusterRpcIp && !seedNodeIP.contains(clusterRpcIp)) || + (!isClusterRpcIp && seedNodeIP.contains(clusterRpcIp))) { logger.error( - "LOCAL_IP={} and SEED_NODES={} should be consistent, both use local ip or real ip please", - configLocalIP, seedNodes); + "cluster_rpc_ip={} and seed_nodes={} should be consistent, both use local ip or real ip please", + configClusterRpcIp, 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 5f3a806..ca77d5a 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,10 +26,10 @@ public class ClusterConfig { static final String CONFIG_NAME = "iotdb-cluster.properties"; - private String localIP = "127.0.0.1"; - private int localMetaPort = 9003; - private int localDataPort = 40010; - private int localClientPort = 55560; + private String clusterRpcIp = "127.0.0.1"; + private int internalMetaPort = 9003; + private int internalDataPort = 40010; + private int clusterRpcPort = 55560; /** * each one is a "<IP | domain name>:<meta port>:<data port>" string tuple @@ -54,7 +54,7 @@ public class ClusterConfig { * This parameter controls when to actually delete snapshoted logs because we can't remove * snapshoted logs directly from disk now */ - private long maxRemovedLogSize = 1024 * 1024 * 128L; + private long maxUnsnapshotedLogSize = 1024 * 1024 * 128L; private int queryTimeoutInSec = 30; @@ -123,28 +123,28 @@ public class ClusterConfig { this.useBatchInLogCatchUp = useBatchInLogCatchUp; } - public long getMaxRemovedLogSize() { - return maxRemovedLogSize; + public long getMaxUnsnapshotedLogSize() { + return maxUnsnapshotedLogSize; } - public void setMaxRemovedLogSize(long maxRemovedLogSize) { - this.maxRemovedLogSize = maxRemovedLogSize; + public void setMaxUnsnapshotedLogSize(long maxUnsnapshotedLogSize) { + this.maxUnsnapshotedLogSize = maxUnsnapshotedLogSize; } - public String getLocalIP() { - return localIP; + public String getClusterRpcIp() { + return clusterRpcIp; } - void setLocalIP(String localIP) { - this.localIP = localIP; + void setClusterRpcIp(String clusterRpcIp) { + this.clusterRpcIp = clusterRpcIp; } - public int getLocalMetaPort() { - return localMetaPort; + public int getInternalMetaPort() { + return internalMetaPort; } - void setLocalMetaPort(int localMetaPort) { - this.localMetaPort = localMetaPort; + void setInternalMetaPort(int internalMetaPort) { + this.internalMetaPort = internalMetaPort; } public boolean isRpcThriftCompressionEnabled() { @@ -179,20 +179,20 @@ public class ClusterConfig { this.replicationNum = replicationNum; } - public int getLocalDataPort() { - return localDataPort; + public int getInternalDataPort() { + return internalDataPort; } - public void setLocalDataPort(int localDataPort) { - this.localDataPort = localDataPort; + public void setInternalDataPort(int internalDataPort) { + this.internalDataPort = internalDataPort; } - public int getLocalClientPort() { - return localClientPort; + public int getClusterRpcPort() { + return clusterRpcPort; } - public void setLocalClientPort(int localClientPort) { - this.localClientPort = localClientPort; + public void setClusterRpcPort(int clusterRpcPort) { + this.clusterRpcPort = clusterRpcPort; } public int getConnectionTimeoutInMS() { 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 db46625..d0fb38e 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 @@ -113,18 +113,18 @@ public class ClusterDescriptor { logger.error("replaces properties failed, use default conf params"); } else { if (commandLine.hasOption(OPTION_META_PORT)) { - config.setLocalMetaPort(Integer.parseInt(commandLine.getOptionValue(OPTION_META_PORT))); - logger.debug("replace local meta port with={}", config.getLocalMetaPort()); + config.setInternalMetaPort(Integer.parseInt(commandLine.getOptionValue(OPTION_META_PORT))); + logger.debug("replace local meta port with={}", config.getInternalMetaPort()); } if (commandLine.hasOption(OPTION_DATA_PORT)) { - config.setLocalDataPort(Integer.parseInt(commandLine.getOptionValue(OPTION_DATA_PORT))); - logger.debug("replace local data port with={}", config.getLocalDataPort()); + config.setInternalDataPort(Integer.parseInt(commandLine.getOptionValue(OPTION_DATA_PORT))); + logger.debug("replace local data port with={}", config.getInternalDataPort()); } if (commandLine.hasOption(OPTION_CLIENT_PORT)) { - config.setLocalClientPort(Integer.parseInt(commandLine.getOptionValue(OPTION_CLIENT_PORT))); - logger.debug("replace local client port with={}", config.getLocalClientPort()); + config.setClusterRpcPort(Integer.parseInt(commandLine.getOptionValue(OPTION_CLIENT_PORT))); + logger.debug("replace local client port with={}", config.getClusterRpcPort()); } if (commandLine.hasOption(OPTION_SEED_NODES)) { @@ -136,10 +136,10 @@ public class ClusterDescriptor { } public void replaceHostnameWithIp() throws UnknownHostException, BadSeedUrlFormatException { - boolean isInvalidLocalIp = InetAddresses.isInetAddress(config.getLocalIP()); - if (!isInvalidLocalIp) { - String localIP = hostnameToIP(config.getLocalIP()); - config.setLocalIP(localIP); + boolean isInvalidClusterRpcIp = InetAddresses.isInetAddress(config.getClusterRpcIp()); + if (!isInvalidClusterRpcIp) { + String clusterRpcIp = hostnameToIP(config.getClusterRpcIp()); + config.setClusterRpcIp(clusterRpcIp); } List<String> newSeedUrls = new ArrayList<>(); @@ -158,7 +158,7 @@ public class ClusterDescriptor { } } config.setSeedNodeUrls(newSeedUrls); - logger.debug("after replace, the localIP={}, seedUrls={}", config.getLocalIP(), + logger.debug("after replace, the clusterRpcIP={}, seedUrls={}", config.getClusterRpcIp(), config.getSeedNodeUrls()); } @@ -188,28 +188,28 @@ public class ClusterDescriptor { logger.warn("Fail to find config file {}", url, e); } } - config.setLocalIP(properties.getProperty("LOCAL_IP", config.getLocalIP())); + config.setClusterRpcIp(properties.getProperty("cluster_rpc_ip", config.getClusterRpcIp())); - config.setLocalMetaPort(Integer.parseInt(properties.getProperty("LOCAL_META_PORT", - String.valueOf(config.getLocalMetaPort())))); + config.setInternalMetaPort(Integer.parseInt(properties.getProperty("internal_meta_port", + String.valueOf(config.getInternalMetaPort())))); - config.setLocalDataPort(Integer.parseInt(properties.getProperty("LOCAL_DATA_PORT", - Integer.toString(config.getLocalDataPort())))); + config.setInternalDataPort(Integer.parseInt(properties.getProperty("internal_data_port", + Integer.toString(config.getInternalDataPort())))); - config.setLocalClientPort(Integer.parseInt(properties.getProperty("LOCAL_CLIENT_PORT", - Integer.toString(config.getLocalClientPort())))); + config.setClusterRpcPort(Integer.parseInt(properties.getProperty("cluster_rpc_port", + Integer.toString(config.getClusterRpcPort())))); config.setMaxConcurrentClientNum(Integer.parseInt(properties.getProperty( - "MAX_CONCURRENT_CLIENT_NUM", String.valueOf(config.getMaxConcurrentClientNum())))); + "max_concurrent_client_num", String.valueOf(config.getMaxConcurrentClientNum())))); config.setReplicationNum(Integer.parseInt(properties.getProperty( - "REPLICA_NUM", String.valueOf(config.getReplicationNum())))); + "default_replica_num", String.valueOf(config.getReplicationNum())))); config.setRpcThriftCompressionEnabled(Boolean.parseBoolean(properties.getProperty( - "ENABLE_THRIFT_COMPRESSION", String.valueOf(config.isRpcThriftCompressionEnabled())))); + "rpc_thrift_compression_enable", String.valueOf(config.isRpcThriftCompressionEnabled())))); config - .setConnectionTimeoutInMS(Integer.parseInt(properties.getProperty("CONNECTION_TIME_OUT_MS", + .setConnectionTimeoutInMS(Integer.parseInt(properties.getProperty("connection_time_out_ms", String.valueOf(config.getConnectionTimeoutInMS())))); config @@ -217,29 +217,29 @@ public class ClusterDescriptor { String.valueOf(config.getQueryTimeoutInSec())))); config - .setMaxRemovedLogSize(Long.parseLong(properties.getProperty("MAX_REMOVED_LOG_SIZE", - String.valueOf(config.getMaxRemovedLogSize())))); + .setMaxUnsnapshotedLogSize(Long.parseLong(properties.getProperty("max_unsnapshoted_log_size", + String.valueOf(config.getMaxUnsnapshotedLogSize())))); config.setUseBatchInLogCatchUp(Boolean.parseBoolean(properties.getProperty( - "USE_BATCH_IN_CATCH_UP", String.valueOf(config.isUseBatchInLogCatchUp())))); + "use_batch_in_catch_up", String.valueOf(config.isUseBatchInLogCatchUp())))); config.setMaxNumberOfLogs(Integer.parseInt( - properties.getProperty("MAX_NUMBER_OF_LOGS", String.valueOf(config.getMaxNumberOfLogs())))); + properties.getProperty("max_number_of_logs", String.valueOf(config.getMaxNumberOfLogs())))); config.setLogDeleteCheckIntervalSecond(Integer.parseInt(properties - .getProperty("LOG_DELETION_CHECK_INTERVAL_SECOND", + .getProperty("log_deletion_check_interval_second", String.valueOf(config.getLogDeleteCheckIntervalSecond())))); config.setEnableAutoCreateSchema(Boolean.parseBoolean(properties - .getProperty("ENABLE_AUTO_CREATE_SCHEMA", + .getProperty("enable_auto_create_schema", String.valueOf(config.isEnableAutoCreateSchema())))); - String consistencyLevel = properties.getProperty("CONSISTENCY_LEVEL"); + String consistencyLevel = properties.getProperty("consistency_level"); if (consistencyLevel != null) { config.setConsistencyLevel(ConsistencyLevel.getConsistencyLevel(consistencyLevel)); } - String seedUrls = properties.getProperty("SEED_NODES"); + String seedUrls = properties.getProperty("seed_nodes"); if (seedUrls != null) { List<String> urlList = getSeedUrlList(seedUrls); config.setSeedNodeUrls(urlList); @@ -296,14 +296,14 @@ public class ClusterDescriptor { public void loadHotModifiedProps(Properties properties) { config.setMaxConcurrentClientNum(Integer.parseInt(properties - .getProperty("MAX_CONCURRENT_CLIENT_NUM", + .getProperty("max_concurrent_client_num", String.valueOf(config.getMaxConcurrentClientNum())))); config.setConnectionTimeoutInMS(Integer.parseInt(properties - .getProperty("CONNECTION_TIME_OUT_MS", String.valueOf(config.getConnectionTimeoutInMS())))); + .getProperty("connection_time_out_ms", String.valueOf(config.getConnectionTimeoutInMS())))); - config.setMaxRemovedLogSize(Long.parseLong(properties - .getProperty("MAX_REMOVED_LOG_SIZE", String.valueOf(config.getMaxRemovedLogSize())))); + config.setMaxUnsnapshotedLogSize(Long.parseLong(properties + .getProperty("max_unsnapshoted_log_size", String.valueOf(config.getMaxUnsnapshotedLogSize())))); logger.info("Set cluster configuration {}", properties); } diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/serializable/SyncLogDequeSerializer.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/serializable/SyncLogDequeSerializer.java index 5197824..ef31959 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/serializable/SyncLogDequeSerializer.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/serializable/SyncLogDequeSerializer.java @@ -71,7 +71,7 @@ public class SyncLogDequeSerializer implements StableEntryManager { private long removedLogSize = 0; // when the removedLogSize larger than this, we actually delete logs private long maxRemovedLogSize = ClusterDescriptor.getInstance().getConfig() - .getMaxRemovedLogSize(); + .getMaxUnsnapshotedLogSize(); // min version of available log private long minAvailableVersion = 0; // max version of available log 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 df36182..d902c9d 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 @@ -137,8 +137,8 @@ public class ClientServer extends TSServiceImpl { } else { protocolFactory = new TBinaryProtocol.Factory(); } - serverTransport = new TServerSocket(new InetSocketAddress(config.getLocalIP(), - config.getLocalClientPort())); + serverTransport = new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(), + config.getClusterRpcPort())); // async service also requires nonblocking server, and HsHaServer is basically more efficient a // nonblocking server TThreadPoolServer.Args poolArgs = diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/DataClusterServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/DataClusterServer.java index 90b2376..87dd962 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/DataClusterServer.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/DataClusterServer.java @@ -444,10 +444,10 @@ public class DataClusterServer extends RaftServer implements TSDataService.Async @Override TServerTransport getServerSocket() throws TTransportException { if (ClusterDescriptor.getInstance().getConfig().isUseAsyncServer()) { - return new TNonblockingServerSocket(new InetSocketAddress(config.getLocalIP(), + return new TNonblockingServerSocket(new InetSocketAddress(config.getClusterRpcIp(), thisNode.getDataPort()), getConnectionTimeoutInMS()); } else { - return new TServerSocket(new InetSocketAddress(config.getLocalIP(), + return new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(), thisNode.getDataPort())); } } diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java index 1088998..5a22540 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/MetaClusterServer.java @@ -133,11 +133,11 @@ public class MetaClusterServer extends RaftServer implements TSMetaService.Async @Override TServerTransport getServerSocket() throws TTransportException { if (ClusterDescriptor.getInstance().getConfig().isUseAsyncServer()) { - return new TNonblockingServerSocket(new InetSocketAddress(config.getLocalIP(), - config.getLocalMetaPort()), getConnectionTimeoutInMS()); + return new TNonblockingServerSocket(new InetSocketAddress(config.getClusterRpcIp(), + config.getInternalMetaPort()), getConnectionTimeoutInMS()); } else { - return new TServerSocket(new InetSocketAddress(config.getLocalIP(), - config.getLocalMetaPort())); + return new TServerSocket(new InetSocketAddress(config.getClusterRpcIp(), + config.getInternalMetaPort())); } } 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 3c74604..35cb914 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 @@ -76,9 +76,9 @@ public abstract class RaftServer implements RaftService.AsyncIface, RaftService. RaftServer() { thisNode = new Node(); - thisNode.setIp(config.getLocalIP()); - thisNode.setMetaPort(config.getLocalMetaPort()); - thisNode.setDataPort(config.getLocalDataPort()); + thisNode.setIp(config.getClusterRpcIp()); + thisNode.setMetaPort(config.getInternalMetaPort()); + thisNode.setDataPort(config.getInternalDataPort()); } RaftServer(Node thisNode) { diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java index ff96cad..7dd8504 100644 --- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java +++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java @@ -36,7 +36,6 @@ import org.apache.iotdb.db.exception.StorageEngineException; import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException; import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.qp.executor.PlanExecutor; -import org.apache.iotdb.db.qp.physical.crud.InsertPlan; import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan; import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; @@ -59,8 +58,8 @@ public class TestUtils { public static Node getNode(int nodeNum) { Node node = new Node(); node.setIp("192.168.0." + nodeNum); - node.setMetaPort(ClusterDescriptor.getInstance().getConfig().getLocalMetaPort()); - node.setDataPort(ClusterDescriptor.getInstance().getConfig().getLocalDataPort()); + node.setMetaPort(ClusterDescriptor.getInstance().getConfig().getInternalMetaPort()); + node.setDataPort(ClusterDescriptor.getInstance().getConfig().getInternalDataPort()); node.setNodeIdentifier(nodeNum); return node; }
