This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch add_quick_start in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0d72ab9d2bc2fd0eb4bd76e0e156d73b51f2f8c1 Author: qiaojialin <[email protected]> AuthorDate: Wed Jun 29 12:21:16 2022 +0800 rename default ip --- .../resources/conf/iotdb-confignode.properties | 4 ++-- .../iotdb/confignode/conf/ConfigNodeConfig.java | 4 ++-- docs/UserGuide/Cluster/Cluster-Setup.md | 15 +++++++++++++++ docs/UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +- docs/UserGuide/Reference/DataNode-Config-Manual.md | 2 +- docs/zh/UserGuide/Cluster/Cluster-Setup.md | 15 +++++++++++++++ .../UserGuide/Reference/ConfigNode-Config-Manual.md | 2 +- .../zh/UserGuide/Reference/DataNode-Config-Manual.md | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 ++++++------ .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 ++++---- .../iotdb/db/consensus/DataRegionConsensusImpl.java | 3 ++- .../db/consensus/SchemaRegionConsensusImpl.java | 3 ++- .../db/mpp/plan/constant/DataNodeEndPoints.java | 4 ++-- .../scheduler/FragmentInstanceDispatcherImpl.java | 2 +- .../java/org/apache/iotdb/db/service/DataNode.java | 20 ++++++++++---------- .../mpp/plan/scheduler/StandaloneSchedulerTest.java | 8 ++++---- .../iotdb/db/service/ClientRPCServiceImplTest.java | 8 ++++---- 17 files changed, 73 insertions(+), 41 deletions(-) diff --git a/confignode/src/assembly/resources/conf/iotdb-confignode.properties b/confignode/src/assembly/resources/conf/iotdb-confignode.properties index 58913c796d..93ad44f20a 100644 --- a/confignode/src/assembly/resources/conf/iotdb-confignode.properties +++ b/confignode/src/assembly/resources/conf/iotdb-confignode.properties @@ -24,7 +24,7 @@ # could set ip or hostname # Datatype: String -rpc_address=0.0.0.0 +rpc_address=127.0.0.1 # Used for cluster internal RPC communication @@ -44,7 +44,7 @@ consensus_port=22278 # For the first ConfigNode to start, target_config_nodes points to its own ip:port. # For other ConfigNodes that are started or restarted, target_config_nodes points to any running ConfigNode's ip:port. # Datatype: String -target_config_nodes=0.0.0.0:22277 +target_config_nodes=127.0.0.1:22277 #################### diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java index 3c13a3965d..b57a8e1814 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; public class ConfigNodeConfig { /** could set ip or hostname */ - private String rpcAddress = "0.0.0.0"; + private String rpcAddress = "127.0.0.1"; /** used for communication between data node and config node */ private int rpcPort = 22277; @@ -41,7 +41,7 @@ public class ConfigNodeConfig { private int consensusPort = 22278; /** Used for connecting to the ConfigNodeGroup */ - private TEndPoint targetConfigNode = new TEndPoint("0.0.0.0", 22277); + private TEndPoint targetConfigNode = new TEndPoint("127.0.0.1", 22277); /** Mark if the ConfigNode needs to apply */ private boolean needApply = false; diff --git a/docs/UserGuide/Cluster/Cluster-Setup.md b/docs/UserGuide/Cluster/Cluster-Setup.md index f3a7b20b6e..40b74f5fe5 100644 --- a/docs/UserGuide/Cluster/Cluster-Setup.md +++ b/docs/UserGuide/Cluster/Cluster-Setup.md @@ -162,4 +162,19 @@ Start on Linux Start on Windows ``` datanode\sbin\start-cli.bat +``` + +## Quick Start + +unzip apache-iotdb-0.14.0-preview1-all-bin.zip + +Deploy a one-ConfigNode and one-DataNode（1C1D）cluster, default is one replica. +``` +./confignode/sbin/start-confignode.sh +./datanode/sbin/start-datanode.sh +``` + +Start Cli +``` +./datanode/sbin/start-cli.sh ``` \ No newline at end of file diff --git a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md index 13009ef280..c475a680e9 100644 --- a/docs/UserGuide/Reference/ConfigNode-Config-Manual.md +++ b/docs/UserGuide/Reference/ConfigNode-Config-Manual.md @@ -73,7 +73,7 @@ IoTDB Cluster configuration is in ConfigNode. |:---:|:---| |Description| Client rpc service address | |Type| String | -|Default| 0.0.0.0| +|Default| 127.0.0.1| |Effective|After restarting system| * rpc\_port diff --git a/docs/UserGuide/Reference/DataNode-Config-Manual.md b/docs/UserGuide/Reference/DataNode-Config-Manual.md index 7f62659ed1..5e5c5ba473 100644 --- a/docs/UserGuide/Reference/DataNode-Config-Manual.md +++ b/docs/UserGuide/Reference/DataNode-Config-Manual.md @@ -112,7 +112,7 @@ The permission definitions are in ${IOTDB\_CONF}/conf/jmx.access. |:---:|:---| |Description| The client rpc service listens on the address.| |Type|String| -|Default| "0.0.0.0" | +|Default| 0.0.0.0 | |Effective|After restarting system| * rpc\_port diff --git a/docs/zh/UserGuide/Cluster/Cluster-Setup.md b/docs/zh/UserGuide/Cluster/Cluster-Setup.md index b82cf51f88..a9e64a4ab6 100644 --- a/docs/zh/UserGuide/Cluster/Cluster-Setup.md +++ b/docs/zh/UserGuide/Cluster/Cluster-Setup.md @@ -163,4 +163,19 @@ Linux 启动方式 Windows 启动方式 ``` datanode\sbin\start-cli.bat +``` + +## 快速上手 + +解压 apache-iotdb-0.14.0-preview1-all-bin.zip + +部署 1 个 ConfigNode 和 1 个 DataNode（1C1D）集群版，默认 1 副本。 +``` +./confignode/sbin/start-confignode.sh +./datanode/sbin/start-datanode.sh +``` + +启动 Cli +``` +./datanode/sbin/start-cli.sh ``` \ No newline at end of file diff --git a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md index fd2a4859dc..9ed3ee8d1a 100644 --- a/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/ConfigNode-Config-Manual.md @@ -71,7 +71,7 @@ IoTDB 集群的全局配置通过 ConfigNode 配置。 |:---:|:---| |描述| rpc地址 | |类型| String | -|默认值| 0.0.0.0| +|默认值| 127.0.0.1| |改后生效方式|重启服务生效| * rpc\_port diff --git a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md index 0a08bc6907..366343c04d 100644 --- a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md @@ -95,7 +95,7 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB |:---:|:---| |描述| rpc地址 | |类型| String | -|默认值| 0.0.0.0| +|默认值| 127.0.0.1| |改后生效方式|重启服务生效| * rpc\_port diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 30d9fe70a3..e8470e94ef 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -827,8 +827,8 @@ public class IoTDBConfig { /** cache size for pages in one schema file */ private int pageCacheSizeInSchemaFile = 1024; - /** Internal ip for data node */ - private String internalIp = "127.0.0.1"; + /** Internal address for data node */ + private String internalAddress = "127.0.0.1"; /** Internal port for coordinator */ private int internalPort = 9003; @@ -2704,12 +2704,12 @@ public class IoTDBConfig { this.pageCacheSizeInSchemaFile = pageCacheSizeInSchemaFile; } - public String getInternalIp() { - return internalIp; + public String getInternalAddress() { + return internalAddress; } - public void setInternalIp(String internalIp) { - this.internalIp = internalIp; + public void setInternalAddress(String internalAddress) { + this.internalAddress = internalAddress; } public int getInternalPort() { diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 94fbd09147..0c70bc3a5e 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -930,9 +930,9 @@ public class IoTDBDescriptor { conf.setRpcAddress(InetAddress.getByName(conf.getRpcAddress()).getHostAddress()); } - boolean isInvalidInternalIp = InetAddresses.isInetAddress(conf.getInternalIp()); + boolean isInvalidInternalIp = InetAddresses.isInetAddress(conf.getInternalAddress()); if (!isInvalidInternalIp) { - conf.setInternalIp(InetAddress.getByName(conf.getInternalIp()).getHostAddress()); + conf.setInternalAddress(InetAddress.getByName(conf.getInternalAddress()).getHostAddress()); } for (TEndPoint configNode : conf.getTargetConfigNodeList()) { @@ -946,7 +946,7 @@ public class IoTDBDescriptor { logger.debug( "after replace, the rpcIP={}, internalIP={}, configNodeUrls={}", conf.getRpcAddress(), - conf.getInternalIp(), + conf.getInternalAddress(), conf.getTargetConfigNodeList()); } @@ -1655,7 +1655,7 @@ public class IoTDBDescriptor { } } - conf.setInternalIp(properties.getProperty("internal_address", conf.getInternalIp())); + conf.setInternalAddress(properties.getProperty("internal_address", conf.getInternalAddress())); conf.setInternalPort( Integer.parseInt( diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java index 54d70ab164..08e3e74ef1 100644 --- a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java @@ -56,7 +56,8 @@ public class DataRegionConsensusImpl { conf.getDataRegionConsensusProtocolClass(), ConsensusConfig.newBuilder() .setThisNode( - new TEndPoint(conf.getInternalIp(), conf.getDataRegionConsensusPort())) + new TEndPoint( + conf.getInternalAddress(), conf.getDataRegionConsensusPort())) .setStorageDir(conf.getDataRegionConsensusDir()) .setMultiLeaderConfig( MultiLeaderConfig.newBuilder() diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java index bcc8f584c0..af95eb6fa4 100644 --- a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java @@ -53,7 +53,8 @@ public class SchemaRegionConsensusImpl { conf.getSchemaRegionConsensusProtocolClass(), ConsensusConfig.newBuilder() .setThisNode( - new TEndPoint(conf.getInternalIp(), conf.getSchemaRegionConsensusPort())) + new TEndPoint( + conf.getInternalAddress(), conf.getSchemaRegionConsensusPort())) .setStorageDir(conf.getSchemaRegionConsensusDir()) .build(), gid -> diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java index f09c67fc5b..5e8ec756a9 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/DataNodeEndPoints.java @@ -25,12 +25,12 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor; public class DataNodeEndPoints { public static final TEndPoint LOCAL_HOST_DATA_BLOCK_ENDPOINT = new TEndPoint( - IoTDBDescriptor.getInstance().getConfig().getInternalIp(), + IoTDBDescriptor.getInstance().getConfig().getInternalAddress(), IoTDBDescriptor.getInstance().getConfig().getMppDataExchangePort()); public static final TEndPoint LOCAL_HOST_INTERNAL_ENDPOINT = new TEndPoint( - IoTDBDescriptor.getInstance().getConfig().getInternalIp(), + IoTDBDescriptor.getInstance().getConfig().getInternalAddress(), IoTDBDescriptor.getInstance().getConfig().getInternalPort()); public static boolean isSameNode(TEndPoint endPoint) { diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java index 35c301e230..8e21fb108e 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -81,7 +81,7 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { this.executor = executor; this.writeOperationExecutor = writeOperationExecutor; this.internalServiceClientManager = internalServiceClientManager; - this.localhostIpAddr = IoTDBDescriptor.getInstance().getConfig().getInternalIp(); + this.localhostIpAddr = IoTDBDescriptor.getInstance().getConfig().getInternalAddress(); this.localhostInternalPort = IoTDBDescriptor.getInstance().getConfig().getInternalPort(); } diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java index 4762f54a41..50f03fda2d 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -113,10 +113,10 @@ public class DataNode implements DataNodeMBean { // if client ip is the default address, set it same with internal ip if (config.getRpcAddress().equals("0.0.0.0")) { - config.setRpcAddress(config.getInternalIp()); + config.setRpcAddress(config.getInternalAddress()); } - thisNode.setIp(IoTDBDescriptor.getInstance().getConfig().getInternalIp()); + thisNode.setIp(IoTDBDescriptor.getInstance().getConfig().getInternalAddress()); thisNode.setPort(IoTDBDescriptor.getInstance().getConfig().getInternalPort()); } @@ -180,13 +180,13 @@ public class DataNode implements DataNodeMBean { location.setDataNodeId(config.getDataNodeId()); location.setClientRpcEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort())); location.setInternalEndPoint( - new TEndPoint(config.getInternalIp(), config.getInternalPort())); + new TEndPoint(config.getInternalAddress(), config.getInternalPort())); location.setMPPDataExchangeEndPoint( - new TEndPoint(config.getInternalIp(), config.getMppDataExchangePort())); + new TEndPoint(config.getInternalAddress(), config.getMppDataExchangePort())); location.setDataRegionConsensusEndPoint( - new TEndPoint(config.getInternalIp(), config.getDataRegionConsensusPort())); + new TEndPoint(config.getInternalAddress(), config.getDataRegionConsensusPort())); location.setSchemaRegionConsensusEndPoint( - new TEndPoint(config.getInternalIp(), config.getSchemaRegionConsensusPort())); + new TEndPoint(config.getInternalAddress(), config.getSchemaRegionConsensusPort())); // Set DataNodeInfo TDataNodeInfo info = new TDataNodeInfo(); @@ -354,13 +354,13 @@ public class DataNode implements DataNodeMBean { location.setDataNodeId(config.getDataNodeId()); location.setClientRpcEndPoint(new TEndPoint(config.getRpcAddress(), config.getRpcPort())); location.setInternalEndPoint( - new TEndPoint(config.getInternalIp(), config.getInternalPort())); + new TEndPoint(config.getInternalAddress(), config.getInternalPort())); location.setMPPDataExchangeEndPoint( - new TEndPoint(config.getInternalIp(), config.getMppDataExchangePort())); + new TEndPoint(config.getInternalAddress(), config.getMppDataExchangePort())); location.setDataRegionConsensusEndPoint( - new TEndPoint(config.getInternalIp(), config.getDataRegionConsensusPort())); + new TEndPoint(config.getInternalAddress(), config.getDataRegionConsensusPort())); location.setSchemaRegionConsensusEndPoint( - new TEndPoint(config.getInternalIp(), config.getSchemaRegionConsensusPort())); + new TEndPoint(config.getInternalAddress(), config.getSchemaRegionConsensusPort())); TDataNodeActiveReq req = new TDataNodeActiveReq(); req.setLocation(location); req.setDataNodeId(config.getDataNodeId()); diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java index 5bfdb231ac..6a19ade539 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java @@ -504,13 +504,13 @@ public class StandaloneSchedulerTest { dataNodeList.add( new TDataNodeLocation() .setClientRpcEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort())) - .setInternalEndPoint(new TEndPoint(conf.getInternalIp(), conf.getInternalPort())) + .setInternalEndPoint(new TEndPoint(conf.getInternalAddress(), conf.getInternalPort())) .setMPPDataExchangeEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getMppDataExchangePort())) + new TEndPoint(conf.getInternalAddress(), conf.getMppDataExchangePort())) .setDataRegionConsensusEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getDataRegionConsensusPort())) + new TEndPoint(conf.getInternalAddress(), conf.getDataRegionConsensusPort())) .setSchemaRegionConsensusEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getSchemaRegionConsensusPort()))); + new TEndPoint(conf.getInternalAddress(), conf.getSchemaRegionConsensusPort()))); // construct fragmentInstance return new TRegionReplicaSet(new TConsensusGroupId(type, 0), dataNodeList); diff --git a/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java b/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java index 17be292632..01d8e44461 100644 --- a/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java +++ b/server/src/test/java/org/apache/iotdb/db/service/ClientRPCServiceImplTest.java @@ -319,13 +319,13 @@ public class ClientRPCServiceImplTest { dataNodeList.add( new TDataNodeLocation() .setClientRpcEndPoint(new TEndPoint(conf.getRpcAddress(), conf.getRpcPort())) - .setInternalEndPoint(new TEndPoint(conf.getInternalIp(), conf.getInternalPort())) + .setInternalEndPoint(new TEndPoint(conf.getInternalAddress(), conf.getInternalPort())) .setMPPDataExchangeEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getMppDataExchangePort())) + new TEndPoint(conf.getInternalAddress(), conf.getMppDataExchangePort())) .setDataRegionConsensusEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getDataRegionConsensusPort())) + new TEndPoint(conf.getInternalAddress(), conf.getDataRegionConsensusPort())) .setSchemaRegionConsensusEndPoint( - new TEndPoint(conf.getInternalIp(), conf.getSchemaRegionConsensusPort()))); + new TEndPoint(conf.getInternalAddress(), conf.getSchemaRegionConsensusPort()))); // construct fragmentInstance return new TRegionReplicaSet(
