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/09/17 14:13:34 UTC
[dolphinscheduler] 11/20: [Doc][Bug] Fix resource center docs for standalone mode (#11600)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch 3.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit c8f0a66b37d965878f3d6aa3c967b0fd7a8b9a3b
Author: Eric Gao <er...@gmail.com>
AuthorDate: Tue Aug 23 09:46:01 2022 +0800
[Doc][Bug] Fix resource center docs for standalone mode (#11600)
* Fix resource center docs for standalone mode
* Remove useless images
(cherry picked from commit ff4d2c9460d36e0cf7523927072c0772782a512b)
---
docs/docs/en/guide/resource/configuration.md | 6 ++++--
docs/docs/zh/guide/resource/configuration.md | 14 ++++++++------
docs/img/dag1.png | Bin 110306 -> 0 bytes
docs/img/log_en.png | Bin 101272 -> 0 bytes
docs/img/process_definition_en.png | Bin 102514 -> 0 bytes
docs/img/task-log.png | Bin 104454 -> 0 bytes
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/docs/docs/en/guide/resource/configuration.md b/docs/docs/en/guide/resource/configuration.md
index 219f603e14..132747b711 100644
--- a/docs/docs/en/guide/resource/configuration.md
+++ b/docs/docs/en/guide/resource/configuration.md
@@ -9,7 +9,8 @@
### Configure `common.properties`
-Configure `api-server/conf/common.properties` and `worker-server/conf/common.properties` as follows:
+If you deploy DolphinScheduler in `Cluster` or `Pseudo-Cluster` mode, you need to configure `api-server/conf/common.properties` and `worker-server/conf/common.properties`.
+If you deploy DolphinScheduler in `Standalone` mode, you only need to configure `standalone-server/conf/common.properties` as follows:
- Change `resource.storage.upload.base.path` to your local directory path. Please make sure the `tenant resource.hdfs.root.user` has read and write permissions for `resource.storage.upload.base.path`, e,g. `/tmp/dolphinscheduler`. `DolphinScheduler` will create the directory you configure if it does not exist.
- Modify `resource.storage.type=HDFS` and `resource.hdfs.fs.defaultFS=file:///`.
@@ -136,6 +137,7 @@ task.resource.limit.state=false
> **Note:**
>
-> * If only the `api-server/conf/common.properties` file is configured, then resource uploading is enabled, but you can not use resources in task. If you want to use or execute the files in the workflow you need to configure `worker-server/conf/common.properties` too.
+> * If only the `api-server/conf/common.properties` file is configured, then resource uploading is enabled, but you can not use resources in task. If you want to use or execute the files in the workflow you need to configure `worker-server/conf/common.properties` too.
> * If you want to use the resource upload function, the deployment user in [installation and deployment](../installation/standalone.md) must have relevant operation authority.
> * If you using a Hadoop cluster with HA, you need to enable HDFS resource upload, and you need to copy the `core-site.xml` and `hdfs-site.xml` under the Hadoop cluster to `worker-server/conf` and `api-server/conf`, otherwise skip this copy step.
+
diff --git a/docs/docs/zh/guide/resource/configuration.md b/docs/docs/zh/guide/resource/configuration.md
index b77a1286a4..a54bd4abd0 100644
--- a/docs/docs/zh/guide/resource/configuration.md
+++ b/docs/docs/zh/guide/resource/configuration.md
@@ -9,12 +9,13 @@
### 配置 `common.properties` 文件
-对以下路径的文件进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`
+如果您以 `集群` 模式或者 `伪集群` 模式部署DolphinScheduler，您需要对以下路径的文件进行配置：`api-server/conf/common.properties` 和 `worker-server/conf/common.properties`；
+若您以 `单机` 模式部署DolphinScheduler，您只需要配置 `standalone-server/conf/common.properties`，具体配置如下：
- 将 `resource.storage.upload.base.path` 改为本地存储路径，请确保部署 DolphinScheduler 的用户拥有读写权限，例如：`resource.storage.upload.base.path=/tmp/dolphinscheduler`。当路径不存在时会自动创建文件夹
- 修改 `resource.storage.type=HDFS` 和 `resource.hdfs.fs.defaultFS=file:///`。
-> **注意**：如果您不想用默认值作为资源中心的基础路径，请修改`resource.storage.upload.base.path`的值。
+> **注意**：如果您不想用默认值作为资源中心的基础路径，请修改`resource.storage.upload.base.path`的值。
## 对接分布式或远端对象存储
@@ -123,8 +124,9 @@ development.state=false
alert.rpc.port=50052
```
-> **注意**：
+> **注意**：
>
-> * 如果只配置了 `api-server/conf/common.properties` 的文件，则只是开启了资源上传的操作，并不能满足正常使用。如果想要在工作流中执行相关文件则需要额外配置 `worker-server/conf/common.properties`。
-> * 如果用到资源上传的功能，那么[安装部署](../installation/standalone.md)中，部署用户需要有这部分的操作权限。
-> * 如果 Hadoop 集群的 NameNode 配置了 HA 的话，需要开启 HDFS 类型的资源上传，同时需要将 Hadoop 集群下的 `core-site.xml` 和 `hdfs-site.xml` 复制到 `worker-server/conf` 以及 `api-server/conf`，非 NameNode HA 跳过次步骤。
+> * 如果只配置了 `api-server/conf/common.properties` 的文件，则只是开启了资源上传的操作，并不能满足正常使用。如果想要在工作流中执行相关文件则需要额外配置 `worker-server/conf/common.properties`。
+> * 如果用到资源上传的功能，那么[安装部署](../installation/standalone.md)中，部署用户需要有这部分的操作权限。
+> * 如果 Hadoop 集群的 NameNode 配置了 HA 的话，需要开启 HDFS 类型的资源上传，同时需要将 Hadoop 集群下的 `core-site.xml` 和 `hdfs-site.xml` 复制到 `worker-server/conf` 以及 `api-server/conf`，非 NameNode HA 跳过次步骤。
+
diff --git a/docs/img/dag1.png b/docs/img/dag1.png
deleted file mode 100644
index 9b06e4b9c3..0000000000
Binary files a/docs/img/dag1.png and /dev/null differ
diff --git a/docs/img/log_en.png b/docs/img/log_en.png
deleted file mode 100644
index d0c1948c2f..0000000000
Binary files a/docs/img/log_en.png and /dev/null differ
diff --git a/docs/img/process_definition_en.png b/docs/img/process_definition_en.png
deleted file mode 100644
index 73707f4278..0000000000
Binary files a/docs/img/process_definition_en.png and /dev/null differ
diff --git a/docs/img/task-log.png b/docs/img/task-log.png
deleted file mode 100644
index 13fb0afd49..0000000000
Binary files a/docs/img/task-log.png and /dev/null differ