diff --git a/docs/docs/en/guide/expansion-reduction.md b/docs/docs/en/guide/expansion-reduction.md index 10cffd59bf..09a6897fa7 100644 --- a/docs/docs/en/guide/expansion-reduction.md +++ b/docs/docs/en/guide/expansion-reduction.md @@ -5,8 +5,8 @@ This article describes how to add a new master service or worker service to an existing DolphinScheduler cluster. ``` - Attention: There cannot be more than one master service process or worker service process on a physical machine. - If the physical machine which locate the expansion master or worker node has already installed the scheduled service, check the [1.4 Modify configuration] and edit the configuration file `conf/config/install_config.conf` on ** all ** nodes, add masters or workers parameter, and restart the scheduling cluster. +Attention: There cannot be more than one master service process or worker service process on a physical machine. + If the physical machine which locate the expansion master or worker node has already installed the scheduled service, check the [1.4 Modify configuration] and edit the configuration file `bin/env/install_env.sh` on ** all ** nodes, add masters or workers parameter, and restart the scheduling cluster. ``` ### Basic software installation @@ -97,14 +97,12 @@ sed -i 's/Defaults requirett/#Defaults requirett/g' /etc/sudoers - Soft link the `JDK` to `/usr/bin/java` (still using `JAVA_HOME=/opt/soft/java` as an example) - ```shell - sudo ln -s /opt/soft/java/bin/java /usr/bin/java - ``` - - - Modify the configuration file `conf/config/install_config.conf` on the **all** nodes, synchronizing the following configuration. - - * To add a new master node, you need to modify the IPs and masters parameters. - * To add a new worker node, modify the IPs and workers parameters. + ```shell + sudo ln -s /opt/soft/java/bin/java /usr/bin/java + ``` +- Modify the configuration file `bin/env/install_env.sh` on the **all** nodes, synchronizing the following configuration. + * To add a new master node, you need to modify the IPs and masters parameters. + * To add a new worker node, modify the IPs and workers parameters. ```shell # which machines to deploy DS services on, separated by commas between multiple physical machines @@ -227,10 +225,9 @@ If the corresponding master service or worker service does not exist, then the m ### Modify the Configuration File - - modify the configuration file `conf/config/install_config.conf` on the **all** nodes, synchronizing the following configuration. - - * to scale down the master node, modify the IPs and masters parameters. - * to scale down worker nodes, modify the IPs and workers parameters. +- modify the configuration file `bin/env/install_env.sh` on the **all** nodes, synchronizing the following configuration. + * to scale down the master node, modify the IPs and masters parameters. + * to scale down worker nodes, modify the IPs and workers parameters. ```shell # which machines to deploy DS services on, "localhost" for this machine diff --git a/docs/docs/en/guide/upgrade.md b/docs/docs/en/guide/upgrade.md index 92a54f5885..92e203d3d4 100644 --- a/docs/docs/en/guide/upgrade.md +++ b/docs/docs/en/guide/upgrade.md @@ -36,7 +36,7 @@ Execute database upgrade script: `sh ./tools/bin/upgrade-schema.sh` ### Upgrade Service -#### Change Configuration `bin/env/install_config.conf` +#### Change Configuration `bin/env/install_env.sh` - If you deploy with Pseudo-Cluster deployment, change it according to [Pseudo-Cluster](./installation/pseudo-cluster.md) section "Modify Configuration". - If you deploy with Cluster deployment, change it according to [Cluster](./installation/cluster.md) section "Modify Configuration". @@ -61,7 +61,7 @@ The architecture of worker group is different between version before version 1.3 | 1 | service1 | 192.168.xx.10 | | 2 | service2 | 192.168.xx.11,192.168.xx.12 | -- Modify worker related configuration in `bin/env/install_config.conf`. +- Modify worker related configuration in `bin/env/install_env.sh`. Assume bellow are the machine worker service to be deployed: diff --git a/docs/docs/zh/guide/expansion-reduction.md b/docs/docs/zh/guide/expansion-reduction.md index 5d5d267c25..736279cc97 100644 --- a/docs/docs/zh/guide/expansion-reduction.md +++ b/docs/docs/zh/guide/expansion-reduction.md @@ -5,8 +5,8 @@ 本文扩容是针对现有的DolphinScheduler集群添加新的master或者worker节点的操作说明. ``` - 注意： 一台物理机上不能存在多个master服务进程或者worker服务进程. - 如果扩容master或者worker节点所在的物理机已经安装了调度的服务,请直接跳到 [1.4.修改配置]. 编辑 ** 所有 ** 节点上的配置文件 `conf/config/install_config.conf`. 新增masters或者workers参数,重启调度集群即可. +注意： 一台物理机上不能存在多个master服务进程或者worker服务进程. + 如果扩容master或者worker节点所在的物理机已经安装了调度的服务,请直接跳到 [1.4.修改配置]. 编辑 ** 所有 ** 节点上的配置文件 `bin/env/install_env.sh`. 新增masters或者workers参数,重启调度集群即可. ``` ### 1.1. 基础软件安装(必装项请自行安装) @@ -95,14 +95,12 @@ sed -i 's/Defaults requirett/#Defaults requirett/g' /etc/sudoers - 将jdk软链到/usr/bin/java下(仍以 JAVA_HOME=/opt/soft/java 为例) - ```shell - sudo ln -s /opt/soft/java/bin/java /usr/bin/java - ``` - - - 修改 **所有** 节点上的配置文件 `conf/config/install_config.conf`, 同步修改以下配置. - - * 新增的master节点, 需要修改 ips 和 masters 参数. - * 新增的worker节点, 需要修改 ips 和 workers 参数. + ```shell + sudo ln -s /opt/soft/java/bin/java /usr/bin/java + ``` +- 修改 **所有** 节点上的配置文件 `bin/env/install_env.sh`, 同步修改以下配置. + * 新增的master节点, 需要修改 ips 和 masters 参数. + * 新增的worker节点, 需要修改 ips 和 workers 参数. ```shell #在哪些机器上新增部署DS服务,多个物理机之间用逗号隔开. @@ -224,10 +222,9 @@ bash bin/dolphinscheduler-daemon.sh start alert-server 启动 alert 服务 ### 2.2 修改配置文件 - - 修改 **所有** 节点上的配置文件 `conf/config/install_config.conf`, 同步修改以下配置. - - * 缩容master节点, 需要修改 ips 和 masters 参数. - * 缩容worker节点, 需要修改 ips 和 workers 参数. +- 修改 **所有** 节点上的配置文件 `bin/env/install_env.sh`, 同步修改以下配置. + * 缩容master节点, 需要修改 ips 和 masters 参数. + * 缩容worker节点, 需要修改 ips 和 workers 参数. ```shell #在哪些机器上部署DS服务，本机选localhost diff --git a/docs/docs/zh/guide/upgrade.md b/docs/docs/zh/guide/upgrade.md index 4c7bd9c299..7a394eceb9 100644 --- a/docs/docs/zh/guide/upgrade.md +++ b/docs/docs/zh/guide/upgrade.md @@ -35,7 +35,7 @@ jar 包 并添加到 `./tools/libs` 目录下，修改 `./bin/env/dolphinschedul ### 服务升级 -#### 修改 `bin/env/install_config.conf` 配置内容 +#### 修改 `bin/env/install_env.sh` 配置内容 - 伪集群部署请参照[伪集群部署(Pseudo-Cluster)](./installation/pseudo-cluster.md)中的 `修改相关配置` - 集群部署请参照[集群部署(Cluster)](./installation/cluster.md)中的 `修改相关配置` @@ -62,7 +62,7 @@ jar 包 并添加到 `./tools/libs` 目录下，修改 `./bin/env/dolphinschedul | 1 | service1 | 192.168.xx.10 | | 2 | service2 | 192.168.xx.11,192.168.xx.12 | -- 修改 `bin/env/install_config.conf` 中的 workers 参数 +- 修改 `bin/env/install_env.sh` 中的 workers 参数 假设以下为要部署的 worker 主机名和 ip 的对应关系 | 主机名 | ip |