You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2022/01/09 12:15:55 UTC
[dolphinscheduler-website] branch master updated: [Fix-7838]Modify ZK related docs after version 2.0 (#629)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/master by this push:
new e037610 [Fix-7838]Modify ZK related docs after version 2.0 (#629)
e037610 is described below
commit e0376105d778f2527aca42cbd53a69253c1d8766
Author: xiangzihao <46...@qq.com>
AuthorDate: Sun Jan 9 20:15:47 2022 +0800
[Fix-7838]Modify ZK related docs after version 2.0 (#629)
---
.../2.0.0/user_doc/architecture/configuration.md | 31 +++++++-------
.../2.0.1/user_doc/architecture/configuration.md | 31 +++++++-------
.../2.0.2/user_doc/architecture/configuration.md | 23 +++++-----
.../2.0.0/user_doc/architecture/configuration.md | 49 +++++++++++-----------
.../2.0.1/user_doc/architecture/configuration.md | 49 +++++++++++-----------
.../2.0.2/user_doc/architecture/configuration.md | 25 +++++------
6 files changed, 107 insertions(+), 101 deletions(-)
diff --git a/docs/en-us/2.0.0/user_doc/architecture/configuration.md b/docs/en-us/2.0.0/user_doc/architecture/configuration.md
index 5dbfc5a..3f09552 100644
--- a/docs/en-us/2.0.0/user_doc/architecture/configuration.md
+++ b/docs/en-us/2.0.0/user_doc/architecture/configuration.md
@@ -16,7 +16,7 @@ Currently, all the configuration files are under [conf ] directory. Please check
├─conf configurations directory
│ ├─application-api.properties API-service config properties
│ ├─datasource.properties datasource config properties
-│ ├─zookeeper.properties zookeeper config properties
+│ ├─registry.properties registry config properties
│ ├─master.properties master config properties
│ ├─worker.properties worker config properties
│ ├─quartz.properties quartz config properties
@@ -58,7 +58,7 @@ serial number| service classification| config file|
|--|--|--|
1|startup/shutdown DS application|dolphinscheduler-daemon.sh
2|datasource config properties| datasource.properties
-3|zookeeper config properties|zookeeper.properties
+3|registry config properties|registry.properties
4|common-service[storage] config properties|common.properties
5|API-service config properties|application-api.properties
6|master config properties|master.properties
@@ -67,11 +67,11 @@ serial number| service classification| config file|
9|quartz config properties|quartz.properties
10|DS environment variables configuration script[install/start DS]|install_config.conf
11|load environment variables configs <br /> [eg: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]|dolphinscheduler_env.sh
-12|services log config files|API-service log config : logback-api.xml <br /> master-service log config : logback-master.xml <br /> worker-service log config : logback-worker.xml <br /> alert-service log config : logback-alert.xml
+12|services log config files|API-service log config : logback-api.xml <br /> master-service log config : logback-master.xml <br /> worker-service log config : logback-worker.xml <br /> alert-service log config : logback-alert.xml
## 1.dolphinscheduler-daemon.sh [startup/shutdown DS application]
-dolphinscheduler-daemon.sh is responsible for DS startup & shutdown.
+dolphinscheduler-daemon.sh is responsible for DS startup & shutdown.
Essentially, start-all.sh/stop-all.sh startup/shutdown the cluster via dolphinscheduler-daemon.sh.
Currently, DS just makes a basic config, please config further JVＭ options based on your practical situation of resources.
@@ -90,7 +90,7 @@ export DOLPHINSCHEDULER_OPTS="
"
```
-> "-XX:DisableExplicitGC" is not recommended due to may lead to memory link (DS dependent on Netty to communicate).
+> "-XX:DisableExplicitGC" is not recommended due to may lead to memory link (DS dependent on Netty to communicate).
## 2.datasource.properties [datasource config properties]
DS uses Druid to manage database connections and default simplified configs are:
@@ -118,20 +118,21 @@ spring.datasource.poolPreparedStatements|true| Open PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| specify the size of PSCache on each connection
-## 3.zookeeper.properties [zookeeper config properties]
+## 3.registry.properties [registry config properties, default is zookeeper]
|Parameters | Default value| Description|
|--|--|--|
-zookeeper.quorum|localhost:2181| zookeeper cluster connection info
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS is stored under zookeeper root directory
-zookeeper.session.timeout|60000| session timeout
-zookeeper.connection.timeout|30000| connection timeout
-zookeeper.retry.base.sleep|100| time to wait between subsequent retries
-zookeeper.retry.max.sleep|30000| maximum time to wait between subsequent retries
-zookeeper.retry.maxtime|10| maximum retry times
+registry.plugin.name|zookeeper| plugin name
+registry.servers|localhost:2181| zookeeper cluster connection info
+registry.namespace|dolphinscheduler| DS is stored under zookeeper root directory(Start without /)
+registry.base.sleep.time.ms|60| time to wait between subsequent retries
+registry.max.sleep.ms|300| maximum time to wait between subsequent retries
+registry.max.retries|5| maximum retry times
+registry.session.timeout.ms|30000| session timeout
+registry.connection.timeout.ms|7500| connection timeout
## 4.common.properties [hadoop、s3、yarn config properties]
-Currently, common.properties mainly configures hadoop/s3a related configurations.
+Currently, common.properties mainly configures hadoop/s3a related configurations.
|Parameters | Default value| Description|
|--|--|--|
data.basedir.path|/tmp/dolphinscheduler| local directory used to store temp files
@@ -251,7 +252,7 @@ install_config.conf is a bit complicated and is mainly used in the following two
* 1.DS cluster auto installation
> System will load configs in the install_config.conf and auto-configure files below, based on the file content when executing 'install.sh'.
-> Files such as dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
+> Files such as dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
* 2.Startup/shutdown DS cluster
diff --git a/docs/en-us/2.0.1/user_doc/architecture/configuration.md b/docs/en-us/2.0.1/user_doc/architecture/configuration.md
index 5dbfc5a..3f09552 100644
--- a/docs/en-us/2.0.1/user_doc/architecture/configuration.md
+++ b/docs/en-us/2.0.1/user_doc/architecture/configuration.md
@@ -16,7 +16,7 @@ Currently, all the configuration files are under [conf ] directory. Please check
├─conf configurations directory
│ ├─application-api.properties API-service config properties
│ ├─datasource.properties datasource config properties
-│ ├─zookeeper.properties zookeeper config properties
+│ ├─registry.properties registry config properties
│ ├─master.properties master config properties
│ ├─worker.properties worker config properties
│ ├─quartz.properties quartz config properties
@@ -58,7 +58,7 @@ serial number| service classification| config file|
|--|--|--|
1|startup/shutdown DS application|dolphinscheduler-daemon.sh
2|datasource config properties| datasource.properties
-3|zookeeper config properties|zookeeper.properties
+3|registry config properties|registry.properties
4|common-service[storage] config properties|common.properties
5|API-service config properties|application-api.properties
6|master config properties|master.properties
@@ -67,11 +67,11 @@ serial number| service classification| config file|
9|quartz config properties|quartz.properties
10|DS environment variables configuration script[install/start DS]|install_config.conf
11|load environment variables configs <br /> [eg: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]|dolphinscheduler_env.sh
-12|services log config files|API-service log config : logback-api.xml <br /> master-service log config : logback-master.xml <br /> worker-service log config : logback-worker.xml <br /> alert-service log config : logback-alert.xml
+12|services log config files|API-service log config : logback-api.xml <br /> master-service log config : logback-master.xml <br /> worker-service log config : logback-worker.xml <br /> alert-service log config : logback-alert.xml
## 1.dolphinscheduler-daemon.sh [startup/shutdown DS application]
-dolphinscheduler-daemon.sh is responsible for DS startup & shutdown.
+dolphinscheduler-daemon.sh is responsible for DS startup & shutdown.
Essentially, start-all.sh/stop-all.sh startup/shutdown the cluster via dolphinscheduler-daemon.sh.
Currently, DS just makes a basic config, please config further JVＭ options based on your practical situation of resources.
@@ -90,7 +90,7 @@ export DOLPHINSCHEDULER_OPTS="
"
```
-> "-XX:DisableExplicitGC" is not recommended due to may lead to memory link (DS dependent on Netty to communicate).
+> "-XX:DisableExplicitGC" is not recommended due to may lead to memory link (DS dependent on Netty to communicate).
## 2.datasource.properties [datasource config properties]
DS uses Druid to manage database connections and default simplified configs are:
@@ -118,20 +118,21 @@ spring.datasource.poolPreparedStatements|true| Open PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| specify the size of PSCache on each connection
-## 3.zookeeper.properties [zookeeper config properties]
+## 3.registry.properties [registry config properties, default is zookeeper]
|Parameters | Default value| Description|
|--|--|--|
-zookeeper.quorum|localhost:2181| zookeeper cluster connection info
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS is stored under zookeeper root directory
-zookeeper.session.timeout|60000| session timeout
-zookeeper.connection.timeout|30000| connection timeout
-zookeeper.retry.base.sleep|100| time to wait between subsequent retries
-zookeeper.retry.max.sleep|30000| maximum time to wait between subsequent retries
-zookeeper.retry.maxtime|10| maximum retry times
+registry.plugin.name|zookeeper| plugin name
+registry.servers|localhost:2181| zookeeper cluster connection info
+registry.namespace|dolphinscheduler| DS is stored under zookeeper root directory(Start without /)
+registry.base.sleep.time.ms|60| time to wait between subsequent retries
+registry.max.sleep.ms|300| maximum time to wait between subsequent retries
+registry.max.retries|5| maximum retry times
+registry.session.timeout.ms|30000| session timeout
+registry.connection.timeout.ms|7500| connection timeout
## 4.common.properties [hadoop、s3、yarn config properties]
-Currently, common.properties mainly configures hadoop/s3a related configurations.
+Currently, common.properties mainly configures hadoop/s3a related configurations.
|Parameters | Default value| Description|
|--|--|--|
data.basedir.path|/tmp/dolphinscheduler| local directory used to store temp files
@@ -251,7 +252,7 @@ install_config.conf is a bit complicated and is mainly used in the following two
* 1.DS cluster auto installation
> System will load configs in the install_config.conf and auto-configure files below, based on the file content when executing 'install.sh'.
-> Files such as dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
+> Files such as dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
* 2.Startup/shutdown DS cluster
diff --git a/docs/en-us/2.0.2/user_doc/architecture/configuration.md b/docs/en-us/2.0.2/user_doc/architecture/configuration.md
index 5dbfc5a..b40201d 100644
--- a/docs/en-us/2.0.2/user_doc/architecture/configuration.md
+++ b/docs/en-us/2.0.2/user_doc/architecture/configuration.md
@@ -16,7 +16,7 @@ Currently, all the configuration files are under [conf ] directory. Please check
├─conf configurations directory
│ ├─application-api.properties API-service config properties
│ ├─datasource.properties datasource config properties
-│ ├─zookeeper.properties zookeeper config properties
+│ ├─registry.properties registry config properties
│ ├─master.properties master config properties
│ ├─worker.properties worker config properties
│ ├─quartz.properties quartz config properties
@@ -58,7 +58,7 @@ serial number| service classification| config file|
|--|--|--|
1|startup/shutdown DS application|dolphinscheduler-daemon.sh
2|datasource config properties| datasource.properties
-3|zookeeper config properties|zookeeper.properties
+3|registry config properties|registry.properties
4|common-service[storage] config properties|common.properties
5|API-service config properties|application-api.properties
6|master config properties|master.properties
@@ -118,16 +118,17 @@ spring.datasource.poolPreparedStatements|true| Open PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| specify the size of PSCache on each connection
-## 3.zookeeper.properties [zookeeper config properties]
+## 3.registry.properties [registry config properties, default is zookeeper]
|Parameters | Default value| Description|
|--|--|--|
-zookeeper.quorum|localhost:2181| zookeeper cluster connection info
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS is stored under zookeeper root directory
-zookeeper.session.timeout|60000| session timeout
-zookeeper.connection.timeout|30000| connection timeout
-zookeeper.retry.base.sleep|100| time to wait between subsequent retries
-zookeeper.retry.max.sleep|30000| maximum time to wait between subsequent retries
-zookeeper.retry.maxtime|10| maximum retry times
+registry.plugin.name|zookeeper| plugin name
+registry.servers|localhost:2181| zookeeper cluster connection info
+registry.namespace|dolphinscheduler| DS is stored under zookeeper root directory(Start without /)
+registry.base.sleep.time.ms|60| time to wait between subsequent retries
+registry.max.sleep.ms|300| maximum time to wait between subsequent retries
+registry.max.retries|5| maximum retry times
+registry.session.timeout.ms|30000| session timeout
+registry.connection.timeout.ms|7500| connection timeout
## 4.common.properties [hadoop、s3、yarn config properties]
@@ -251,7 +252,7 @@ install_config.conf is a bit complicated and is mainly used in the following two
* 1.DS cluster auto installation
> System will load configs in the install_config.conf and auto-configure files below, based on the file content when executing 'install.sh'.
-> Files such as dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
+> Files such as dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties and etc.
* 2.Startup/shutdown DS cluster
diff --git a/docs/zh-cn/2.0.0/user_doc/architecture/configuration.md b/docs/zh-cn/2.0.0/user_doc/architecture/configuration.md
index ceb99a2..a1603fe 100644
--- a/docs/zh-cn/2.0.0/user_doc/architecture/configuration.md
+++ b/docs/zh-cn/2.0.0/user_doc/architecture/configuration.md
@@ -18,7 +18,7 @@
├─conf 配置文件目录
│ ├─application-api.properties api服务配置文件
│ ├─datasource.properties 数据库配置文件
-│ ├─zookeeper.properties zookeeper配置文件
+│ ├─registry.properties registry配置文件
│ ├─master.properties master服务配置文件
│ ├─worker.properties worker服务配置文件
│ ├─quartz.properties quartz服务配置文件
@@ -60,7 +60,7 @@
|--|--|--|
1|启动/关闭DS服务脚本|dolphinscheduler-daemon.sh
2|数据库连接配置 | datasource.properties
-3|zookeeper连接配置|zookeeper.properties
+3|registry连接配置|registry.properties
4|公共[存储]配置|common.properties
5|API服务配置|application-api.properties
6|Master服务配置|master.properties
@@ -69,11 +69,11 @@
9|Quartz配置|quartz.properties
10|DS环境变量配置脚本[用于DS安装/启动]|install_config.conf
11|运行脚本加载环境变量配置文件 <br />[如: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]|dolphinscheduler_env.sh
-12|各服务日志配置文件|api服务日志配置文件 : logback-api.xml <br /> master服务日志配置文件 : logback-master.xml <br /> worker服务日志配置文件 : logback-worker.xml <br /> alert服务日志配置文件 : logback-alert.xml
+12|各服务日志配置文件|api服务日志配置文件 : logback-api.xml <br /> master服务日志配置文件 : logback-master.xml <br /> worker服务日志配置文件 : logback-worker.xml <br /> alert服务日志配置文件 : logback-alert.xml
## 1.dolphinscheduler-daemon.sh [启动/关闭DS服务脚本]
-dolphinscheduler-daemon.sh脚本负责DS的启动&关闭.
+dolphinscheduler-daemon.sh脚本负责DS的启动&关闭.
start-all.sh/stop-all.sh最终也是通过dolphinscheduler-daemon.sh对集群进行启动/关闭操作.
目前DS只是做了一个基本的设置,JVM参数请根据各自资源的实际情况自行设置.
@@ -120,21 +120,22 @@ spring.datasource.poolPreparedStatements|true| 开启PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。
-## 3.zookeeper.properties [zookeeper连接配置]
-|参数 |默认值| 描述|
+## 3.registry.properties [registry连接配置,默认使用zookeeper]
+|参数 |默认值| 描述|
|--|--|--|
-zookeeper.quorum|localhost:2181| zk集群连接信息
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS在zookeeper存储根目录
-zookeeper.session.timeout|60000| session 超时
-zookeeper.connection.timeout|30000| 连接超时
-zookeeper.retry.base.sleep|100| 基本重试时间差
-zookeeper.retry.max.sleep|30000| 最大重试时间
-zookeeper.retry.maxtime|10|最大重试次数
+registry.plugin.name|zookeeper| 插件名称
+registry.servers|localhost:2181| zk集群连接信息
+registry.namespace|dolphinscheduler| DS在zookeeper存储根目录(开头不带/)
+registry.base.sleep.time.ms|60| 基本重试时间差
+registry.max.sleep.ms|300| 最大重试时间
+registry.max.retries|5| 最大重试次数
+registry.session.timeout.ms|30000| session 超时时间
+registry.connection.timeout.ms|7500| 连接超时时间
## 4.common.properties [hadoop、s3、yarn配置]
-common.properties配置文件目前主要是配置hadoop/s3a相关的配置.
-|参数 |默认值| 描述|
+common.properties配置文件目前主要是配置hadoop/s3a相关的配置.
+|参数 |默认值| 描述|
|--|--|--|
data.basedir.path|/tmp/dolphinscheduler|本地工作目录,用于存放临时文件
resource.storage.type|NONE|资源文件存储类型: HDFS,S3,NONE
@@ -157,7 +158,7 @@ development.state|false|是否处于开发模式
## 5.application-api.properties [API服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
server.port|12345|api服务通讯端口
server.servlet.session.timeout|7200|session超时时间
@@ -172,7 +173,7 @@ security.authentication.type|PASSWORD|权限校验类型
## 6.master.properties [Master服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
master.listen.port|5678|master监听端口
master.exec.threads|100|master工作线程数量,用于限制并行的流程实例数量
@@ -187,7 +188,7 @@ master.reserved.memory|0.3|master预留内存,只有低于系统可用内存时,
## 7.worker.properties [Worker服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
worker.listen.port|1234|worker监听端口
worker.exec.threads|100|worker工作线程数量,用于限制并行的任务实例数量
@@ -198,7 +199,7 @@ worker.groups|default|worker分组配置,逗号分隔,例如'worker.groups=defau
## 8.alert.properties [Alert 告警服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
alert.type|EMAIL|告警类型|
mail.protocol|SMTP| 邮件服务器协议
@@ -226,7 +227,7 @@ plugin.dir|/Users/xx/your/path/to/plugin/dir|插件目录
## 9.quartz.properties [Quartz配置]
这里面主要是quartz配置,请结合实际业务场景&资源进行配置,本文暂时不做展开.
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
@@ -250,10 +251,10 @@ org.quartz.dataSource.myDs.connectionProvider.class | org.apache.dolphinschedule
## 10.install_config.conf [DS环境变量配置脚本[用于DS安装/启动]]
install_config.conf这个配置文件比较繁琐,这个文件主要有两个地方会用到.
-* 1.DS集群的自动安装.
+* 1.DS集群的自动安装.
-> 调用install.sh脚本会自动加载该文件中的配置.并根据该文件中的内容自动配置上述的配置文件中的内容.
-> 比如:dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
+> 调用install.sh脚本会自动加载该文件中的配置.并根据该文件中的内容自动配置上述的配置文件中的内容.
+> 比如:dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
* 2.DS集群的启动&关闭.
@@ -281,7 +282,7 @@ username="xx"
# 数据库 密码
password="xx"
-# Zookeeper地址
+# zookeeper地址
zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
# 将DS安装到哪个目录，如: /data1_1T/dolphinscheduler，
diff --git a/docs/zh-cn/2.0.1/user_doc/architecture/configuration.md b/docs/zh-cn/2.0.1/user_doc/architecture/configuration.md
index ceb99a2..a1603fe 100644
--- a/docs/zh-cn/2.0.1/user_doc/architecture/configuration.md
+++ b/docs/zh-cn/2.0.1/user_doc/architecture/configuration.md
@@ -18,7 +18,7 @@
├─conf 配置文件目录
│ ├─application-api.properties api服务配置文件
│ ├─datasource.properties 数据库配置文件
-│ ├─zookeeper.properties zookeeper配置文件
+│ ├─registry.properties registry配置文件
│ ├─master.properties master服务配置文件
│ ├─worker.properties worker服务配置文件
│ ├─quartz.properties quartz服务配置文件
@@ -60,7 +60,7 @@
|--|--|--|
1|启动/关闭DS服务脚本|dolphinscheduler-daemon.sh
2|数据库连接配置 | datasource.properties
-3|zookeeper连接配置|zookeeper.properties
+3|registry连接配置|registry.properties
4|公共[存储]配置|common.properties
5|API服务配置|application-api.properties
6|Master服务配置|master.properties
@@ -69,11 +69,11 @@
9|Quartz配置|quartz.properties
10|DS环境变量配置脚本[用于DS安装/启动]|install_config.conf
11|运行脚本加载环境变量配置文件 <br />[如: JAVA_HOME,HADOOP_HOME, HIVE_HOME ...]|dolphinscheduler_env.sh
-12|各服务日志配置文件|api服务日志配置文件 : logback-api.xml <br /> master服务日志配置文件 : logback-master.xml <br /> worker服务日志配置文件 : logback-worker.xml <br /> alert服务日志配置文件 : logback-alert.xml
+12|各服务日志配置文件|api服务日志配置文件 : logback-api.xml <br /> master服务日志配置文件 : logback-master.xml <br /> worker服务日志配置文件 : logback-worker.xml <br /> alert服务日志配置文件 : logback-alert.xml
## 1.dolphinscheduler-daemon.sh [启动/关闭DS服务脚本]
-dolphinscheduler-daemon.sh脚本负责DS的启动&关闭.
+dolphinscheduler-daemon.sh脚本负责DS的启动&关闭.
start-all.sh/stop-all.sh最终也是通过dolphinscheduler-daemon.sh对集群进行启动/关闭操作.
目前DS只是做了一个基本的设置,JVM参数请根据各自资源的实际情况自行设置.
@@ -120,21 +120,22 @@ spring.datasource.poolPreparedStatements|true| 开启PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。
-## 3.zookeeper.properties [zookeeper连接配置]
-|参数 |默认值| 描述|
+## 3.registry.properties [registry连接配置,默认使用zookeeper]
+|参数 |默认值| 描述|
|--|--|--|
-zookeeper.quorum|localhost:2181| zk集群连接信息
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS在zookeeper存储根目录
-zookeeper.session.timeout|60000| session 超时
-zookeeper.connection.timeout|30000| 连接超时
-zookeeper.retry.base.sleep|100| 基本重试时间差
-zookeeper.retry.max.sleep|30000| 最大重试时间
-zookeeper.retry.maxtime|10|最大重试次数
+registry.plugin.name|zookeeper| 插件名称
+registry.servers|localhost:2181| zk集群连接信息
+registry.namespace|dolphinscheduler| DS在zookeeper存储根目录(开头不带/)
+registry.base.sleep.time.ms|60| 基本重试时间差
+registry.max.sleep.ms|300| 最大重试时间
+registry.max.retries|5| 最大重试次数
+registry.session.timeout.ms|30000| session 超时时间
+registry.connection.timeout.ms|7500| 连接超时时间
## 4.common.properties [hadoop、s3、yarn配置]
-common.properties配置文件目前主要是配置hadoop/s3a相关的配置.
-|参数 |默认值| 描述|
+common.properties配置文件目前主要是配置hadoop/s3a相关的配置.
+|参数 |默认值| 描述|
|--|--|--|
data.basedir.path|/tmp/dolphinscheduler|本地工作目录,用于存放临时文件
resource.storage.type|NONE|资源文件存储类型: HDFS,S3,NONE
@@ -157,7 +158,7 @@ development.state|false|是否处于开发模式
## 5.application-api.properties [API服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
server.port|12345|api服务通讯端口
server.servlet.session.timeout|7200|session超时时间
@@ -172,7 +173,7 @@ security.authentication.type|PASSWORD|权限校验类型
## 6.master.properties [Master服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
master.listen.port|5678|master监听端口
master.exec.threads|100|master工作线程数量,用于限制并行的流程实例数量
@@ -187,7 +188,7 @@ master.reserved.memory|0.3|master预留内存,只有低于系统可用内存时,
## 7.worker.properties [Worker服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
worker.listen.port|1234|worker监听端口
worker.exec.threads|100|worker工作线程数量,用于限制并行的任务实例数量
@@ -198,7 +199,7 @@ worker.groups|default|worker分组配置,逗号分隔,例如'worker.groups=defau
## 8.alert.properties [Alert 告警服务配置]
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
alert.type|EMAIL|告警类型|
mail.protocol|SMTP| 邮件服务器协议
@@ -226,7 +227,7 @@ plugin.dir|/Users/xx/your/path/to/plugin/dir|插件目录
## 9.quartz.properties [Quartz配置]
这里面主要是quartz配置,请结合实际业务场景&资源进行配置,本文暂时不做展开.
-|参数 |默认值| 描述|
+|参数 |默认值| 描述|
|--|--|--|
org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.jobStore.driverDelegateClass | org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
@@ -250,10 +251,10 @@ org.quartz.dataSource.myDs.connectionProvider.class | org.apache.dolphinschedule
## 10.install_config.conf [DS环境变量配置脚本[用于DS安装/启动]]
install_config.conf这个配置文件比较繁琐,这个文件主要有两个地方会用到.
-* 1.DS集群的自动安装.
+* 1.DS集群的自动安装.
-> 调用install.sh脚本会自动加载该文件中的配置.并根据该文件中的内容自动配置上述的配置文件中的内容.
-> 比如:dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
+> 调用install.sh脚本会自动加载该文件中的配置.并根据该文件中的内容自动配置上述的配置文件中的内容.
+> 比如:dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
* 2.DS集群的启动&关闭.
@@ -281,7 +282,7 @@ username="xx"
# 数据库 密码
password="xx"
-# Zookeeper地址
+# zookeeper地址
zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
# 将DS安装到哪个目录，如: /data1_1T/dolphinscheduler，
diff --git a/docs/zh-cn/2.0.2/user_doc/architecture/configuration.md b/docs/zh-cn/2.0.2/user_doc/architecture/configuration.md
index ceb99a2..e581010 100644
--- a/docs/zh-cn/2.0.2/user_doc/architecture/configuration.md
+++ b/docs/zh-cn/2.0.2/user_doc/architecture/configuration.md
@@ -18,7 +18,7 @@
├─conf 配置文件目录
│ ├─application-api.properties api服务配置文件
│ ├─datasource.properties 数据库配置文件
-│ ├─zookeeper.properties zookeeper配置文件
+│ ├─registry.properties registry配置文件
│ ├─master.properties master服务配置文件
│ ├─worker.properties worker服务配置文件
│ ├─quartz.properties quartz服务配置文件
@@ -60,7 +60,7 @@
|--|--|--|
1|启动/关闭DS服务脚本|dolphinscheduler-daemon.sh
2|数据库连接配置 | datasource.properties
-3|zookeeper连接配置|zookeeper.properties
+3|registry连接配置|registry.properties
4|公共[存储]配置|common.properties
5|API服务配置|application-api.properties
6|Master服务配置|master.properties
@@ -120,16 +120,17 @@ spring.datasource.poolPreparedStatements|true| 开启PSCache
spring.datasource.maxPoolPreparedStatementPerConnectionSize|20| 要启用PSCache，必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true。
-## 3.zookeeper.properties [zookeeper连接配置]
+## 3.registry.properties [registry连接配置,默认使用zookeeper]
|参数 |默认值| 描述|
|--|--|--|
-zookeeper.quorum|localhost:2181| zk集群连接信息
-zookeeper.dolphinscheduler.root|/dolphinscheduler| DS在zookeeper存储根目录
-zookeeper.session.timeout|60000| session 超时
-zookeeper.connection.timeout|30000| 连接超时
-zookeeper.retry.base.sleep|100| 基本重试时间差
-zookeeper.retry.max.sleep|30000| 最大重试时间
-zookeeper.retry.maxtime|10|最大重试次数
+registry.plugin.name|zookeeper| 插件名称
+registry.servers|localhost:2181| zk集群连接信息
+registry.namespace|dolphinscheduler| DS在zookeeper存储根目录(开头不带/)
+registry.base.sleep.time.ms|60| 基本重试时间差
+registry.max.sleep.ms|300| 最大重试时间
+registry.max.retries|5| 最大重试次数
+registry.session.timeout.ms|30000| session 超时时间
+registry.connection.timeout.ms|7500| 连接超时时间
## 4.common.properties [hadoop、s3、yarn配置]
@@ -253,7 +254,7 @@ install_config.conf这个配置文件比较繁琐,这个文件主要有两个地
* 1.DS集群的自动安装.
> 调用install.sh脚本会自动加载该文件中的配置.并根据该文件中的内容自动配置上述的配置文件中的内容.
-> 比如:dolphinscheduler-daemon.sh、datasource.properties、zookeeper.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
+> 比如:dolphinscheduler-daemon.sh、datasource.properties、registry.properties、common.properties、application-api.properties、master.properties、worker.properties、alert.properties、quartz.properties 等文件.
* 2.DS集群的启动&关闭.
@@ -281,7 +282,7 @@ username="xx"
# 数据库 密码
password="xx"
-# Zookeeper地址
+# zookeeper地址
zkQuorum="192.168.xx.xx:2181,192.168.xx.xx:2181,192.168.xx.xx:2181"
# 将DS安装到哪个目录，如: /data1_1T/dolphinscheduler，