You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/03/27 12:42:21 UTC
[incubator-doris] branch master updated: [Conf][API Change] Change
the default FE meta dir and BE storage_root_path
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new d3555e3 [Conf][API Change] Change the default FE meta dir and BE storage_root_path
d3555e3 is described below
commit d3555e36248bc27d4d2ae1b0572cd6ff2477e7fe
Author: gengjun-git <54...@users.noreply.github.com>
AuthorDate: Fri Mar 27 20:42:12 2020 +0800
[Conf][API Change] Change the default FE meta dir and BE storage_root_path
1. Change word of palo to doris in conf file.
2. Set default meta_dir to ${DORIS_HOME}/doris-meta
3. Comment out FE meta_dir, leave it to ${DORIS_HOME}/doris-meta, as exsting in FE Config.java.
4. Comment out BE storage_root_path, leave it to ${DORIS_HOME}/storage, as exsting in BE config.h.
NOTICE: default config is changed.
---
conf/be.conf | 13 +++++++------
conf/fe.conf | 5 +++--
docs/documentation/cn/installing/install-deploy.md | 6 +++---
docs/documentation/en/installing/install-deploy_EN.md | 6 +++---
fe/src/main/java/org/apache/doris/common/Config.java | 4 ++--
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/conf/be.conf b/conf/be.conf
index d9aa974..5d9de5b 100644
--- a/conf/be.conf
+++ b/conf/be.conf
@@ -36,15 +36,16 @@ brpc_port = 8060
# you can specify the storage medium of each root path, HDD or SSD
# you can add capacity limit at the end of each root path, seperate by ','
# eg:
-# storage_root_path = /home/disk1/palo.HDD,50;/home/disk2/palo.SSD,1;/home/disk2/palo
-# /home/disk1/palo.HDD, capacity limit is 50GB, HDD;
-# /home/disk2/palo.SSD, capacity limit is 1GB, SSD;
-# /home/disk2/palo, capacity limit is disk capacity, HDD(default)
+# storage_root_path = /home/disk1/doris.HDD,50;/home/disk2/doris.SSD,1;/home/disk2/doris
+# /home/disk1/doris.HDD, capacity limit is 50GB, HDD;
+# /home/disk2/doris.SSD, capacity limit is 1GB, SSD;
+# /home/disk2/doris, capacity limit is disk capacity, HDD(default)
#
# you also can specify the properties by setting '<property>:<value>', seperate by ','
# property 'medium' has a higher priority than the extension of path
-# storage_root_path = /home/disk1/palo,medium:ssd,capacity:50
-storage_root_path = /home/disk1/palo;/home/disk2/palo
+#
+# Default value is ${DORIS_HOME}/storage, you should create it by hand.
+# storage_root_path = ${DORIS_HOME}/storage
# Advanced configurations
# sys_log_dir = ${DORIS_HOME}/log
diff --git a/conf/fe.conf b/conf/fe.conf
index 7f3acbd..7140676 100644
--- a/conf/fe.conf
+++ b/conf/fe.conf
@@ -18,7 +18,7 @@
#####################################################################
## The uppercase properties are read and exported by bin/start_fe.sh.
## To see all Frontend configurations,
-## see fe/src/com/baidu/palo/common/Config.java
+## see fe/src/org/apache/doris/common/Config.java
#####################################################################
# the output dir of stderr and stdout
@@ -38,7 +38,8 @@ JAVA_OPTS_FOR_JDK_9="-Xmx4096m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -X
sys_log_level = INFO
# store metadata, create it if it is not exist.
-meta_dir = ${DORIS_HOME}/palo-meta
+# Default value is ${DORIS_HOME}/doris-meta
+# meta_dir = ${DORIS_HOME}/doris-meta
http_port = 8030
rpc_port = 9020
diff --git a/docs/documentation/cn/installing/install-deploy.md b/docs/documentation/cn/installing/install-deploy.md
index ef94f3f..9207cc4 100644
--- a/docs/documentation/cn/installing/install-deploy.md
+++ b/docs/documentation/cn/installing/install-deploy.md
@@ -133,7 +133,7 @@ BROKER 当前没有，也不需要 priority\_networks 这个选项。Broker 的
* 配置 FE
- 1. 配置文件为 conf/fe.conf。其中注意：`meta_dir`：元数据存放位置。默认在 fe/palo-meta/ 下。需**手动创建**该目录。
+ 1. 配置文件为 conf/fe.conf。其中注意：`meta_dir`：元数据存放位置。默认在 fe/doris-meta/ 下。需**手动创建**该目录。
2. fe.conf 中 JAVA_OPTS 默认 java 最大堆内存为 4GB，建议生产环境调整至 8G 以上。
* 启动FE
@@ -152,7 +152,7 @@ BROKER 当前没有，也不需要 priority\_networks 这个选项。Broker 的
* 修改所有 BE 的配置
- 修改 be/conf/be.conf。主要是配置 `storage_root_path`：数据存放目录，使用 `;` 分隔（最后一个目录后不要加 `;`），其它可以采用默认值。
+ 修改 be/conf/be.conf。主要是配置 `storage_root_path`：数据存放目录。默认在be/storage下，需要**手动创建**该目录。多个路径之间使用 `;` 分隔（最后一个目录后不要加 `;`）。
* 在 FE 中添加所有 BE 节点
@@ -380,7 +380,7 @@ Broker 是无状态的进程，可以随意启停。当然，停止后，正在
除了 Master FE 以外，其余角色节点（Follower FE，Observer FE，Backend），都需要通过 `ALTER SYSTEM ADD` 语句先注册到集群，然后才能加入集群。
- Master FE 在第一次启动时，会在 palo-meta/image/VERSION 文件中生成一个 cluster_id。
+ Master FE 在第一次启动时，会在 doris-meta/image/VERSION 文件中生成一个 cluster_id。
FE 在第一次加入集群时，会首先从 Master FE 获取这个文件。之后每次 FE 之间的重新连接（FE 重启），都会校验自身 cluster id 是否与已存在的其它 FE 的 cluster id 相同。如果不同，则该 FE 会自动退出。
diff --git a/docs/documentation/en/installing/install-deploy_EN.md b/docs/documentation/en/installing/install-deploy_EN.md
index 695c32b..0504dbb 100644
--- a/docs/documentation/en/installing/install-deploy_EN.md
+++ b/docs/documentation/en/installing/install-deploy_EN.md
@@ -137,7 +137,7 @@ BROKER does not currently have, nor does it need, priority\ networks. Broker's s
* Configure FE
- 1. The configuration file is conf/fe.conf. Note: `meta_dir`: Metadata storage location. The default is fe/palo-meta/. The directory needs to be **created manually** by.
+ 1. The configuration file is conf/fe.conf. Note: `meta_dir`: Metadata storage location. The default is fe/doris-meta/. The directory needs to be **created manually** by.
2. JAVA_OPTS in fe.conf defaults to a maximum heap memory of 4GB for java, and it is recommended that the production environment be adjusted to more than 8G.
* Start FE
@@ -156,7 +156,7 @@ BROKER does not currently have, nor does it need, priority\ networks. Broker's s
* Modify all BE configurations
- Modify be/conf/be.conf. Mainly configure `storage_root_path`: data storage directory, using `;` separation (do not add `;` after the last directory), others can use default values.
+ Modify be/conf/be.conf. Mainly configure `storage_root_path`: data storage directory. The default is be/storage, this directory needs to be **created manually** by. In multi directories case, using `;` separation (do not add `;` after the last directory).
* Add all BE nodes to FE
@@ -392,7 +392,7 @@ Broker is a stateless process that can be started or stopped at will. Of course,
In addition to Master FE, the other role nodes (Follower FE, Observer FE, Backend) need to register to the cluster through the `ALTER SYSTEM ADD` statement before joining the cluster.
- When Master FE is first started, a cluster_id is generated in the palo-meta/image/VERSION file.
+ When Master FE is first started, a cluster_id is generated in the doris-meta/image/VERSION file.
When FE first joins the cluster, it first retrieves the file from Master FE. Each subsequent reconnection between FEs (FE reboot) checks whether its cluster ID is the same as that of other existing FEs. If different, the FE will exit automatically.
diff --git a/fe/src/main/java/org/apache/doris/common/Config.java b/fe/src/main/java/org/apache/doris/common/Config.java
index dd11821..e865399 100644
--- a/fe/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/src/main/java/org/apache/doris/common/Config.java
@@ -137,12 +137,12 @@ public class Config extends ConfigBase {
// Configurations for meta data durability
/*
- * Palo meta data will be saved here.
+ * Doris meta data will be saved here.
* The storage of this dir is highly recommended as to be:
* 1. High write performance (SSD)
* 2. Safe (RAID)
*/
- @ConfField public static String meta_dir = PaloFe.DORIS_HOME_DIR + "/palo-meta";
+ @ConfField public static String meta_dir = PaloFe.DORIS_HOME_DIR + "/doris-meta";
/*
* temp dir is used to save intermediate results of some process, such as backup and restore process.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org