This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 858e8f5be Automated deployment:
407a612494e78cbde4bc1ba44812630fc05f987f
858e8f5be is described below
commit 858e8f5be2638232638a4af0f0864b08113e60a1
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Apr 26 05:08:08 2022 +0000
Automated deployment: 407a612494e78cbde4bc1ba44812630fc05f987f
---
.../development/development-environment-setup.html | 21 ++++----
.../development/development-environment-setup.json | 2 +-
.../dev/user_doc/architecture/configuration.html | 45 +++++++++++-----
.../dev/user_doc/architecture/configuration.json | 2 +-
.../dev/user_doc/guide/expansion-reduction.html | 4 +-
.../dev/user_doc/guide/expansion-reduction.json | 2 +-
.../dev/user_doc/guide/installation/cluster.html | 6 +--
.../dev/user_doc/guide/installation/cluster.json | 2 +-
.../guide/installation/pseudo-cluster.html | 59 +++++++++++---------
.../guide/installation/pseudo-cluster.json | 2 +-
.../user_doc/guide/installation/standalone.html | 22 +++++++-
.../user_doc/guide/installation/standalone.json | 2 +-
en-us/docs/dev/user_doc/guide/task/datax.html | 2 +-
en-us/docs/dev/user_doc/guide/task/datax.json | 2 +-
en-us/docs/dev/user_doc/guide/task/flink.html | 2 +-
en-us/docs/dev/user_doc/guide/task/flink.json | 2 +-
en-us/docs/dev/user_doc/guide/task/map-reduce.html | 2 +-
en-us/docs/dev/user_doc/guide/task/map-reduce.json | 2 +-
en-us/docs/dev/user_doc/guide/task/spark.html | 2 +-
en-us/docs/dev/user_doc/guide/task/spark.json | 2 +-
en-us/docs/release/faq.html | 2 +-
en-us/docs/release/faq.json | 2 +-
.../development/development-environment-setup.html | 16 +++---
.../development/development-environment-setup.json | 2 +-
.../dev/user_doc/architecture/configuration.html | 45 +++++++++++-----
.../dev/user_doc/architecture/configuration.json | 2 +-
.../dev/user_doc/guide/expansion-reduction.html | 2 +-
.../dev/user_doc/guide/expansion-reduction.json | 2 +-
.../dev/user_doc/guide/installation/cluster.html | 4 +-
.../dev/user_doc/guide/installation/cluster.json | 2 +-
.../guide/installation/pseudo-cluster.html | 63 ++++++++++++----------
.../guide/installation/pseudo-cluster.json | 2 +-
.../user_doc/guide/installation/standalone.html | 22 +++++++-
.../user_doc/guide/installation/standalone.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/datax.html | 2 +-
zh-cn/docs/dev/user_doc/guide/task/datax.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/flink.html | 2 +-
zh-cn/docs/dev/user_doc/guide/task/flink.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/map-reduce.html | 2 +-
zh-cn/docs/dev/user_doc/guide/task/map-reduce.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/spark.html | 2 +-
zh-cn/docs/dev/user_doc/guide/task/spark.json | 2 +-
zh-cn/docs/dev/user_doc/guide/upgrade.html | 2 +-
zh-cn/docs/dev/user_doc/guide/upgrade.json | 2 +-
zh-cn/docs/release/faq.html | 2 +-
zh-cn/docs/release/faq.json | 2 +-
46 files changed, 234 insertions(+), 143 deletions(-)
diff --git a/en-us/development/development-environment-setup.html
b/en-us/development/development-environment-setup.html
index 8f993ef54..a764b7ffa 100644
--- a/en-us/development/development-environment-setup.html
+++ b/en-us/development/development-environment-setup.html
@@ -37,8 +37,9 @@ git clone [email protected]:apache/dolphinscheduler.git
</ul>
<h2>DolphinScheduler Standalone Quick Start</h2>
<blockquote>
-<p><strong><em>Note:</em></strong> Standalone server only for development and
debugging, cause it use H2 Database, Zookeeper Testing Server which may not
stable in production
-Standalone is only supported in DolphinScheduler 1.3.9 and later versions</p>
+<p><strong><em>Note:</em></strong> Use standalone server only for development
and debugging, because it uses H2 Database as default database and Zookeeper
Testing Server which may not be stable in production.
+Standalone is only supported in DolphinScheduler 1.3.9 and later versions.
+Standalone server is able to connect to external databases like mysql and
postgresql, see <a href="../guide/installation/standalone.md">Standalone
Deployment</a> for instructions.</p>
</blockquote>
<h3>Git Branch Choose</h3>
<p>Use different Git branch to develop different codes</p>
@@ -50,11 +51,11 @@ Standalone is only supported in DolphinScheduler 1.3.9 and
later versions</p>
<p>Find the class
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> in Intellij
IDEA and clikc run main function to startup.</p>
<h3>Start frontend server</h3>
<p>Install frontend dependencies and run it</p>
-<pre><code class="language-shell">cd dolphinscheduler-ui
-npm install
-npm run start
+<pre><code class="language-shell">cd dolphinscheduler-ui-next
+pnpm install
+pnpm run dev
</code></pre>
-<p>The browser access address <a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
can login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
+<p>The browser access address <a
href="http://localhost:3000";>http://localhost:3000</a> can login
DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
<h2>DolphinScheduler Normal Mode</h2>
<h3>Prepare</h3>
<h4>zookeeper</h4>
@@ -140,11 +141,11 @@
dolphinscheduler-service/src/main/resources/registry.properties</p>
</blockquote>
<h3>Start Frontend Server</h3>
<p>Install frontend dependencies and run it</p>
-<pre><code class="language-shell">cd dolphinscheduler-ui
-npm install
-npm run start
+<pre><code class="language-shell">cd dolphinscheduler-ui-next
+pnpm install
+pnpm run dev
</code></pre>
-<p>The browser access address <a
href="http://localhost:12345/dolphinscheduler";>http://localhost:12345/dolphinscheduler</a>
can login DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
+<p>The browser access address <a
href="http://localhost:3000";>http://localhost:3000</a> can login
DolphinScheduler UI. The default username and password are
<strong>admin/dolphinscheduler123</strong></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/development/development-environment-setup.json
b/en-us/development/development-environment-setup.json
index 2da57f27d..2a49e2b66 100644
--- a/en-us/development/development-environment-setup.json
+++ b/en-us/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requests</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a href=\"https://git-scm.com/downloads\";>Git</a>:
DolphinScheduler version control system</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
DolphinScheduler backend language</li>\n<li><a
href=\"http://maven.apache.org/dow [...]
+ "__html": "<h1>DolphinScheduler development</h1>\n<h2>Software
Requests</h2>\n<p>Before setting up the DolphinScheduler development
environment, please make sure you have installed the software as
below:</p>\n<ul>\n<li><a href=\"https://git-scm.com/downloads\";>Git</a>:
DolphinScheduler version control system</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
DolphinScheduler backend language</li>\n<li><a
href=\"http://maven.apache.org/dow [...]
"link": "/dist/en-us/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.html
b/en-us/docs/dev/user_doc/architecture/configuration.html
index 2d7bfdf95..b279e058d 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.html
+++ b/en-us/docs/dev/user_doc/architecture/configuration.html
@@ -942,20 +942,39 @@ alertServer=<span
class="hljs-string">"ds3"</span>
apiServers=<span class="hljs-string">"ds1"</span>
</code></pre>
<h3>dolphinscheduler_env.sh [load environment variables configs]</h3>
-<p>When using shell to commit tasks, DS will load environment variables inside
dolphinscheduler_env.sh into the host.
-Types of tasks involved are: Shell, Python, Spark, Flink, DataX, etc.</p>
-<pre><code class="language-bash"><span class="hljs-built_in">export</span>
HADOOP_HOME=/opt/soft/hadoop
-<span class="hljs-built_in">export</span>
HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
-<span class="hljs-built_in">export</span> SPARK_HOME1=/opt/soft/spark1
-<span class="hljs-built_in">export</span> SPARK_HOME2=/opt/soft/spark2
-<span class="hljs-built_in">export</span> PYTHON_HOME=/opt/soft/python
-<span class="hljs-built_in">export</span> JAVA_HOME=/opt/soft/java
-<span class="hljs-built_in">export</span> HIVE_HOME=/opt/soft/hive
-<span class="hljs-built_in">export</span> FLINK_HOME=/opt/soft/flink
-<span class="hljs-built_in">export</span>
DATAX_HOME=/opt/soft/datax/bin/datax.py
-
-<span class="hljs-built_in">export</span> PATH=<span
class="hljs-variable">$HADOOP_HOME</span>/bin:<span
class="hljs-variable">$SPARK_HOME1</span>/bin:<span
class="hljs-variable">$SPARK_HOME2</span>/bin:<span
class="hljs-variable">$PYTHON_HOME</span>:<span
class="hljs-variable">$JAVA_HOME</span>/bin:<span
class="hljs-variable">$HIVE_HOME</span>/bin:<span
class="hljs-variable">$PATH</span>:<span
class="hljs-variable">$FLINK_HOME</span>/bin:<span
class="hljs-variable">$DATAX_HOME</span>:<s [...]
+<p>When using shell to commit tasks, DolphinScheduler will export environment
variables from <code>bin/env/dolphinscheduler_env.sh</code>. The
+mainly configuration including <code>JAVA_HOME</code>, mata database, registry
center, and task configuration.</p>
+<pre><code class="language-bash"><span class="hljs-comment"># JAVA_HOME, will
use it to start DolphinScheduler server</span>
+<span class="hljs-built_in">export</span> JAVA_HOME=<span
class="hljs-variable">${JAVA_HOME:-/opt/soft/java}</span>
+<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
+<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
+<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_DRIVER_CLASS_NAME
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD
+
+<span class="hljs-comment"># DolphinScheduler server related
configuration</span>
+<span class="hljs-built_in">export</span> SPRING_CACHE_TYPE=<span
class="hljs-variable">${SPRING_CACHE_TYPE:-none}</span>
+<span class="hljs-built_in">export</span> SPRING_JACKSON_TIME_ZONE=<span
class="hljs-variable">${SPRING_JACKSON_TIME_ZONE:-UTC}</span>
+<span class="hljs-built_in">export</span> MASTER_FETCH_COMMAND_NUM=<span
class="hljs-variable">${MASTER_FETCH_COMMAND_NUM:-10}</span>
+
+<span class="hljs-comment"># Registry center configuration, determines the
type and link of the registry center</span>
+<span class="hljs-built_in">export</span> REGISTRY_TYPE=<span
class="hljs-variable">${REGISTRY_TYPE:-zookeeper}</span>
+<span class="hljs-built_in">export</span>
REGISTRY_ZOOKEEPER_CONNECT_STRING=<span
class="hljs-variable">${REGISTRY_ZOOKEEPER_CONNECT_STRING:-localhost:2181}</span>
+
+<span class="hljs-comment"># Tasks related configurations, need to change the
configuration if you use the related tasks.</span>
+<span class="hljs-built_in">export</span> HADOOP_HOME=<span
class="hljs-variable">${HADOOP_HOME:-/opt/soft/hadoop}</span>
+<span class="hljs-built_in">export</span> HADOOP_CONF_DIR=<span
class="hljs-variable">${HADOOP_CONF_DIR:-/opt/soft/hadoop/etc/hadoop}</span>
+<span class="hljs-built_in">export</span> SPARK_HOME1=<span
class="hljs-variable">${SPARK_HOME1:-/opt/soft/spark1}</span>
+<span class="hljs-built_in">export</span> SPARK_HOME2=<span
class="hljs-variable">${SPARK_HOME2:-/opt/soft/spark2}</span>
+<span class="hljs-built_in">export</span> PYTHON_HOME=<span
class="hljs-variable">${PYTHON_HOME:-/opt/soft/python}</span>
+<span class="hljs-built_in">export</span> HIVE_HOME=<span
class="hljs-variable">${HIVE_HOME:-/opt/soft/hive}</span>
+<span class="hljs-built_in">export</span> FLINK_HOME=<span
class="hljs-variable">${FLINK_HOME:-/opt/soft/flink}</span>
+<span class="hljs-built_in">export</span> DATAX_HOME=<span
class="hljs-variable">${DATAX_HOME:-/opt/soft/datax}</span>
+
+<span class="hljs-built_in">export</span> PATH=<span
class="hljs-variable">$HADOOP_HOME</span>/bin:<span
class="hljs-variable">$SPARK_HOME1</span>/bin:<span
class="hljs-variable">$SPARK_HOME2</span>/bin:<span
class="hljs-variable">$PYTHON_HOME</span>/bin:<span
class="hljs-variable">$JAVA_HOME</span>/bin:<span
class="hljs-variable">$HIVE_HOME</span>/bin:<span
class="hljs-variable">$FLINK_HOME</span>/bin:<span
class="hljs-variable">$DATAX_HOME</span>/bin:<span
class="hljs-variable">$PATH</span>
</code></pre>
<h3>Services logback configs</h3>
<table>
diff --git a/en-us/docs/dev/user_doc/architecture/configuration.json
b/en-us/docs/dev/user_doc/architecture/configuration.json
index ad37f6cc6..adaab3615 100644
--- a/en-us/docs/dev/user_doc/architecture/configuration.json
+++ b/en-us/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>Configuration</h1>\n<h2>Preface</h2>\n<p>This document explains the
DolphinScheduler application configurations according to DolphinScheduler-1.3.x
versions.</p>\n<h2>Directory Structure</h2>\n<p>Currently, all the
configuration files are under [conf ] directory.\nCheck the following
simplified DolphinScheduler installation directories to have a direct view
about the position of [conf] directory and configuration files it has.\nThis
[...]
"link": "/dist/en-us/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/expansion-reduction.html
b/en-us/docs/dev/user_doc/guide/expansion-reduction.html
index 52f083d79..ff06b8947 100644
--- a/en-us/docs/dev/user_doc/guide/expansion-reduction.html
+++ b/en-us/docs/dev/user_doc/guide/expansion-reduction.html
@@ -68,11 +68,11 @@ sed -i 's/Defaults requirett/#Defaults
requirett/g' /etc/sudoers
datasource.properties: database connection information
zookeeper.properties: information for connecting zk
common.properties: Configuration information about the resource store (if
hadoop is set up, please check if the core-site.xml and hdfs-site.xml
configuration files exist).
-env/dolphinscheduler<span class="hljs-emphasis">_env.sh: environment Variables
+dolphinscheduler<span class="hljs-emphasis">_env.sh: environment Variables
</span></code></pre>
</li>
<li>
-<p>Modify the <code>dolphinscheduler_env.sh</code> environment variable in the
<code>conf/env</code> directory according to the machine configuration (the
following is the example that all the used software install under
<code>/opt/soft</code>)</p>
+<p>Modify the <code>dolphinscheduler_env.sh</code> environment variable in the
<code>bin/env/dolphinscheduler_env.sh</code> directory according to the machine
configuration (the following is the example that all the used software install
under <code>/opt/soft</code>)</p>
<pre><code class="language-shell"> export HADOOP_HOME=/opt/soft/hadoop
export HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
# export SPARK_HOME1=/opt/soft/spark1
diff --git a/en-us/docs/dev/user_doc/guide/expansion-reduction.json
b/en-us/docs/dev/user_doc/guide/expansion-reduction.json
index 2eb977bdb..9ceed575a 100644
--- a/en-us/docs/dev/user_doc/guide/expansion-reduction.json
+++ b/en-us/docs/dev/user_doc/guide/expansion-reduction.json
@@ -1,6 +1,6 @@
{
"filename": "expansion-reduction.md",
- "__html": "<h1>DolphinScheduler Expansion and
Reduction</h1>\n<h2>Expansion</h2>\n<p>This article describes how to add a new
master service or worker service to an existing DolphinScheduler
cluster.</p>\n<pre><code> Attention: There cannot be more than one master
service process or worker service process on a physical machine.\n If the
physical machine which locate the expansion master or worker node has already
installed the scheduled service, check the [1.4 Modify configuration [...]
+ "__html": "<h1>DolphinScheduler Expansion and
Reduction</h1>\n<h2>Expansion</h2>\n<p>This article describes how to add a new
master service or worker service to an existing DolphinScheduler
cluster.</p>\n<pre><code> Attention: There cannot be more than one master
service process or worker service process on a physical machine.\n If the
physical machine which locate the expansion master or worker node has already
installed the scheduled service, check the [1.4 Modify configuration [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/expansion-reduction.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/cluster.html
b/en-us/docs/dev/user_doc/guide/installation/cluster.html
index 5cc0c00af..e5936f78c 100644
--- a/en-us/docs/dev/user_doc/guide/installation/cluster.html
+++ b/en-us/docs/dev/user_doc/guide/installation/cluster.html
@@ -14,7 +14,7 @@
<p>Cluster deployment is to deploy the DolphinScheduler on multiple machines
for running massive tasks in production.</p>
<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow <a href="standalone.md">Standalone deployment</a>.
If you want to experience more complete functions and schedule massive tasks,
we recommend you install follow <a href="pseudo-cluster.md">pseudo-cluster
deployment</a>. If you want to deploy DolphinScheduler in production, we
recommend you follow <a href="cluster.md">cluster deployment</a> or <a
href="kubernetes.md">Kubernetes depl [...]
<h2>Deployment Steps</h2>
-<p>Cluster deployment uses the same scripts and configuration files as <a
href="pseudo-cluster.md">pseudo-cluster deployment</a>, so the preparation and
deployment steps are the same as pseudo-cluster deployment. The difference is
that <a href="pseudo-cluster.md">pseudo-cluster deployment</a> is for one
machine, while cluster deployment (Cluster) is for multiple machines. And steps
of "Modify Configuration" are quite different between pseudo-cluster
deployment and cluster deplo [...]
+<p>Cluster deployment uses the same scripts and configuration files as <a
href="pseudo-cluster.md">pseudo-cluster deployment</a>, so the preparation and
deployment steps are the same as pseudo-cluster deployment. The difference is
that pseudo-cluster deployment is for one machine, while cluster deployment
(Cluster) is for multiple machines. And steps of "Modify
Configuration" are quite different between pseudo-cluster deployment and
cluster deployment.</p>
<h3>Prerequisites and DolphinScheduler Startup Environment Preparations</h3>
<p>Configure all the configurations refer to <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> on every machine, except
sections <code>Prerequisites</code>, <code>Start ZooKeeper</code> and
<code>Initialize the Database</code> of the <code>DolphinScheduler Startup
Environment</code>.</p>
<h3>Modify Configuration</h3>
@@ -32,9 +32,9 @@ alertServer="ds4"
apiServers="ds5"
</code></pre>
<h2>Start and Login DolphinScheduler</h2>
-<p>Same as <a href="http://pseudo-cluster.md";>pseudo-cluster.md</a>](<a
href="http://pseudo-cluster.md";>pseudo-cluster.md</a>)</p>
+<p>Same as <a href="pseudo-cluster.md">pseudo-cluster</a></p>
<h2>Start and Stop Server</h2>
-<p>Same as <a href="http://pseudo-cluster.md";>pseudo-cluster.md</a>](<a
href="http://pseudo-cluster.md";>pseudo-cluster.md</a>)</p>
+<p>Same as <a href="pseudo-cluster.md">pseudo-cluster</a></p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/installation/cluster.json
b/en-us/docs/dev/user_doc/guide/installation/cluster.json
index 0989ca0f6..aad5a51e2 100644
--- a/en-us/docs/dev/user_doc/guide/installation/cluster.json
+++ b/en-us/docs/dev/user_doc/guide/installation/cluster.json
@@ -1,6 +1,6 @@
{
"filename": "cluster.md",
- "__html": "<h1>Cluster Deployment</h1>\n<p>Cluster deployment is to deploy
the DolphinScheduler on multiple machines for running massive tasks in
production.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluster.md\">pseudo-cluster deployment< [...]
+ "__html": "<h1>Cluster Deployment</h1>\n<p>Cluster deployment is to deploy
the DolphinScheduler on multiple machines for running massive tasks in
production.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluster.md\">pseudo-cluster deployment< [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/installation/cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index f5c8d0ecd..d5aa72ccc 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -87,7 +87,11 @@ sh script/create-dolphinscheduler.sh
```
-->
<h2>Modify Configuration</h2>
-<p>After completing the preparation of the basic environment, you need to
modify the configuration file according to your environment. The configuration
file is in the path of <code>conf/config/install_config.conf</code>. Generally,
you just need to modify the <strong>INSTALL MACHINE, DolphinScheduler ENV,
Database, Registry Server</strong> part to complete the deployment, the
following describes the parameters that must be modified:</p>
+<p>After completing the preparation of the basic environment, you need to
modify the configuration file according to the
+environment you used. The configuration files are both in directory
<code>bin/env</code> and named <code>install_env.sh</code> and
<code>dolphinscheduler_env.sh</code>.</p>
+<h3>Modify <code>install_env.sh</code></h3>
+<p>File <code>install_env.sh</code> describes which machines will be installed
DolphinScheduler and what server will be installed on
+each machine. You could find this file in the path
<code>bin/env/install_env.sh</code> and the detail of the configuration as
below.</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> ---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> INSTALL MACHINE</span>
<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
@@ -103,29 +107,26 @@ installPath="~/dolphinscheduler"
<span class="hljs-meta">
#</span><span class="bash"> Deploy user, use the user you create <span
class="hljs-keyword">in</span> section **Configure machine SSH password-free
login**</span>
deployUser="dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> DolphinScheduler ENV</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> The path of JAVA_HOME,
<span class="hljs-built_in">which</span> JDK install path <span
class="hljs-keyword">in</span> section **Preparation**</span>
-javaHome="/your/java/home/here"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Database</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Database <span
class="hljs-built_in">type</span>, username, password, IP, port, metadata. For
now `dbtype` supports `mysql` and `postgresql`</span>
-dbtype="mysql"
-dbhost="localhost:3306"
-<span class="hljs-meta">#</span><span class="bash"> Need to modify <span
class="hljs-keyword">if</span> you are not using
`dolphinscheduler/dolphinscheduler` as your username and password</span>
-username="dolphinscheduler"
-password="dolphinscheduler"
-dbname="dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Registry Server</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Registration center
address, the address of ZooKeeper service</span>
-registryServers="localhost:2181"
+</code></pre>
+<h3>Modify <code>dolphinscheduler_env.sh</code></h3>
+<p>File <code>dolphinscheduler_env.sh</code> describes the database
configuration of DolphinScheduler, which in the path
<code>bin/env/dolphinscheduler_env.sh</code>
+and some tasks which need external dependencies or libraries such as
<code>JAVA_HOME</code> and <code>SPARK_HOME</code>. You could ignore the
+task external dependencies if you do not use those tasks, but you have to
change <code>JAVA_HOME</code>, registry center and database
+related configurations based on your environment.</p>
+<pre><code class="language-sh"><span class="hljs-comment"># JAVA_HOME, will
use it to start DolphinScheduler server</span>
+<span class="hljs-built_in">export</span> JAVA_HOME=<span
class="hljs-variable">${JAVA_HOME:-/custom/path}</span>
+
+<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
+<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
+<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
+<span class="hljs-built_in">export</span>
SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"username"</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"password"</span>
+
+<span class="hljs-comment"># Registry center configuration, determines the
type and link of the registry center</span>
+<span class="hljs-built_in">export</span> REGISTRY_TYPE=<span
class="hljs-variable">${REGISTRY_TYPE:-zookeeper}</span>
+<span class="hljs-built_in">export</span>
REGISTRY_ZOOKEEPER_CONNECT_STRING=<span
class="hljs-variable">${REGISTRY_ZOOKEEPER_CONNECT_STRING:-localhost:2181}</span>
</code></pre>
<h2>Initialize the Database</h2>
<p>DolphinScheduler metadata is stored in the relational database. Currently,
supports PostgreSQL and MySQL. If you use MySQL, you need to manually download
<a href="https://downloads.MySQL.com/archives/c-j/";>mysql-connector-java
driver</a> (8.0.16) and move it to the lib directory of DolphinScheduler, which
is <code>tools/libs/</code>. Let's take MySQL as an example for how to
initialize the database:</p>
@@ -159,7 +160,7 @@ mysql></span><span class="bash"> CREATE DATABASE
dolphinscheduler DEFAULT CHA
</code></pre>
<h2>Start DolphinScheduler</h2>
<p>Use <strong>deployment user</strong> you created above, running the
following command to complete the deployment, and the server log will be stored
in the logs folder.</p>
-<pre><code class="language-shell">sh install.sh
+<pre><code class="language-shell">sh ./bin/install.sh
</code></pre>
<blockquote>
<p><strong><em>Note:</em></strong> For the first time deployment, there maybe
occur five times of <code>sh: bin/dolphinscheduler-daemon.sh: No such file or
directory</code> in the terminal,
@@ -191,7 +192,13 @@ sh ./bin/dolphinscheduler-daemon.sh start alert-server
sh ./bin/dolphinscheduler-daemon.sh stop alert-server
</code></pre>
<blockquote>
-<p><strong><em>Note:</em></strong>: Please refer to the section of
"System Architecture Design" for service usage. Python gateway
service is
+<p><strong><em>Note1:</em></strong>: Each server have
<code>dolphinscheduler_env.sh</code> file in path
<code><server-name>/conf/dolphinscheduler_env.sh</code> which
+for micro-services need. It means that you could start all servers by command
<code><server-name>/bin/start.sh</code> with different
+environment variable from <code>bin/env/dolphinscheduler_env.sh</code>. But it
will use file <code>bin/env/dolphinscheduler_env.sh</code> overwrite
+<code><server-name>/conf/dolphinscheduler_env.sh</code> if you start
server with command <code>/bin/dolphinscheduler-daemon.sh start
<server-name></code>.</p>
+</blockquote>
+<blockquote>
+<p><strong><em>Note2:</em></strong>: Please refer to the section of
"System Architecture Design" for service usage. Python gateway
service is
started along with the api-server, and if you do not want to start Python
gateway service please disabled it by changing
the yaml config <code>python-gateway.enabled : false</code> in api-server's
configuration path <code>api-server/conf/application.yaml</code></p>
</blockquote>
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index b72311fd3..4880f3eb7 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
+ "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
"link":
"/dist/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/installation/standalone.html
b/en-us/docs/dev/user_doc/guide/installation/standalone.html
index 738993e24..198836ce8 100644
--- a/en-us/docs/dev/user_doc/guide/installation/standalone.html
+++ b/en-us/docs/dev/user_doc/guide/installation/standalone.html
@@ -14,7 +14,8 @@
<p>Standalone only for quick experience for DolphinScheduler.</p>
<p>If you are a new hand and want to experience DolphinScheduler functions, we
recommend you install follow <a href="standalone.md">Standalone deployment</a>.
If you want to experience more complete functions and schedule massive tasks,
we recommend you install follow <a href="pseudo-cluster.md">pseudo-cluster
deployment</a>. If you want to deploy DolphinScheduler in production, we
recommend you follow <a href="cluster.md">cluster deployment</a> or <a
href="kubernetes.md">Kubernetes depl [...]
<blockquote>
-<p><strong><em>Note:</em></strong> Standalone only recommends the usage of
fewer than 20 workflows, because it uses H2 Database, ZooKeeper Testing Server,
too many tasks may cause instability.</p>
+<p><strong><em>Note:</em></strong> Standalone only recommends the usage of
fewer than 20 workflows, because it uses in-memory H2 Database in default,
ZooKeeper Testing Server, too many tasks may cause instability.
+When Standalone stops or restarts, in-memory H2 database will clear up. To use
Standalone with external databases like mysql or postgresql, please see <a
href="#database-configuration"><code>Database Configuration</code></a>.</p>
</blockquote>
<h2>Preparation</h2>
<ul>
@@ -43,6 +44,25 @@ sh ./bin/dolphinscheduler-daemon.sh stop standalone-server
service please disabled it by changing the yaml config
<code>python-gateway.enabled : false</code> in api-server's configuration
path <code>api-server/conf/application.yaml</code></p>
</blockquote>
+<h3>Database Configuration</h3>
+<ul>
+<li>Use mysql as an example to illustrate how to configure an external
database:</li>
+<li>First of all, follow the instructions in <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> <code>Initialize the
Database</code> section to create and initialize database</li>
+<li>Set the following environment variables in your terminal with your
database username and password for {user} and {password}:</li>
+</ul>
+<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
+export SPRING_PROFILES_ACTIVE=${DATABASE}
+export SPRING_DATASOURCE_USERNAME={user}
+export SPRING_DATASOURCE_PASSWORD={password}
+</code></pre>
+<ul>
+<li>
+<p>Add mysql-connector-java driver to
<code>./standalone-server/libs/standalone-server/</code>, see <a
href="pseudo-cluster.md">pseudo-cluster deployment</a> <code>Initialize the
Database</code> section about where to download</p>
+</li>
+<li>
+<p>Start standalone-server, now you are using mysql as database and it will
not clear up your data when you stop or restart standalone-server.</p>
+</li>
+</ul>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>About us</h3><h4>Do you need feedback? Please
contact us through the following ways.</h4></div><div
class="contact-container"><ul><li><a
href="/en-us/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>Email List</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/installation/standalone.json
b/en-us/docs/dev/user_doc/guide/installation/standalone.json
index 020443438..843827281 100644
--- a/en-us/docs/dev/user_doc/guide/installation/standalone.json
+++ b/en-us/docs/dev/user_doc/guide/installation/standalone.json
@@ -1,6 +1,6 @@
{
"filename": "standalone.md",
- "__html": "<h1>Standalone</h1>\n<p>Standalone only for quick experience for
DolphinScheduler.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluster.md\">pseudo-cluster deployment</a>. If you want
to deploy DolphinScheduler in production, we re [...]
+ "__html": "<h1>Standalone</h1>\n<p>Standalone only for quick experience for
DolphinScheduler.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks, we recommend you install
follow <a href=\"pseudo-cluster.md\">pseudo-cluster deployment</a>. If you want
to deploy DolphinScheduler in production, we re [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/installation/standalone.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/datax.html
b/en-us/docs/dev/user_doc/guide/task/datax.html
index b28c00449..31669ac57 100644
--- a/en-us/docs/dev/user_doc/guide/task/datax.html
+++ b/en-us/docs/dev/user_doc/guide/task/datax.html
@@ -46,7 +46,7 @@
<h2>Task Example</h2>
<p>This example demonstrates how to import data from Hive into MySQL.</p>
<h3>Configure the DataX environment in DolphinScheduler</h3>
-<p>If you are using the DataX task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file:
<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>.</p>
+<p>If you are using the DataX task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file: <code>bin/env/dolphinscheduler_env.sh</code>.</p>
<p><img src="/img/tasks/demo/datax_task01.png" alt="datax_task01"></p>
<p>After finish the environment configuration, need to restart
DolphinScheduler.</p>
<h3>Configure DataX Task Node</h3>
diff --git a/en-us/docs/dev/user_doc/guide/task/datax.json
b/en-us/docs/dev/user_doc/guide/task/datax.json
index 585c4ac8d..1d31b0283 100644
--- a/en-us/docs/dev/user_doc/guide/task/datax.json
+++ b/en-us/docs/dev/user_doc/guide/task/datax.json
@@ -1,6 +1,6 @@
{
"filename": "datax.md",
- "__html": "<h1>DataX</h1>\n<h2>Overview</h2>\n<p>DataX task type for
executing DataX programs. For DataX nodes, the worker will execute
<code>${DATAX_HOME}/bin/datax.py</code> to analyze the input json
file.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click <code>Project ->
Management-Project -> Name-Workflow Definition</code>, and click the
<code>Create Workflow</code> button to enter the DAG editing
page.</li>\n<li>Drag from the toolbar <img src=\"/img/tasks/icons/datax.png\"
width=\" [...]
+ "__html": "<h1>DataX</h1>\n<h2>Overview</h2>\n<p>DataX task type for
executing DataX programs. For DataX nodes, the worker will execute
<code>${DATAX_HOME}/bin/datax.py</code> to analyze the input json
file.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click <code>Project ->
Management-Project -> Name-Workflow Definition</code>, and click the
<code>Create Workflow</code> button to enter the DAG editing
page.</li>\n<li>Drag from the toolbar <img src=\"/img/tasks/icons/datax.png\"
width=\" [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/datax.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/flink.html
b/en-us/docs/dev/user_doc/guide/task/flink.html
index b1fcb3e9b..dce721113 100644
--- a/en-us/docs/dev/user_doc/guide/task/flink.html
+++ b/en-us/docs/dev/user_doc/guide/task/flink.html
@@ -51,7 +51,7 @@
<h3>Execute the WordCount Program</h3>
<p>This is a common introductory case in the big data ecosystem, which often
apply to computational frameworks such as MapReduce, Flink and Spark. The main
purpose is to count the number of identical words in the input text. (Flink's
releases attach this example job)</p>
<h4>Configure the flink environment in DolphinScheduler</h4>
-<p>If you are using the flink task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file:
<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>.</p>
+<p>If you are using the flink task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file: <code>bin/env/dolphinscheduler_env.sh</code>.</p>
<p><img src="/img/tasks/demo/flink_task01.png" alt="demo-flink-simple"></p>
<h4>Upload the Main Package</h4>
<p>When using the Flink task node, you need to upload the jar package to the
Resource Center for the execution, refer to the <a
href="../resource.md">resource center</a>.</p>
diff --git a/en-us/docs/dev/user_doc/guide/task/flink.json
b/en-us/docs/dev/user_doc/guide/task/flink.json
index b9f790f97..9bc79dd97 100644
--- a/en-us/docs/dev/user_doc/guide/task/flink.json
+++ b/en-us/docs/dev/user_doc/guide/task/flink.json
@@ -1,6 +1,6 @@
{
"filename": "flink.md",
- "__html": "<h1>Flink Node</h1>\n<h2>Overview</h2>\n<p>Flink task type for
executing Flink programs. For Flink nodes, the worker submits the task by using
the Flink command <code>flink run</code>. See <a
href=\"https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/deployment/cli/\";>flink
cli</a> for more details.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click
<code>Project -> Management-Project -> Name-Workflow Definition</code>,
and click the "Create Workflow" but [...]
+ "__html": "<h1>Flink Node</h1>\n<h2>Overview</h2>\n<p>Flink task type for
executing Flink programs. For Flink nodes, the worker submits the task by using
the Flink command <code>flink run</code>. See <a
href=\"https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/deployment/cli/\";>flink
cli</a> for more details.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click
<code>Project -> Management-Project -> Name-Workflow Definition</code>,
and click the "Create Workflow" but [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/flink.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/map-reduce.html
b/en-us/docs/dev/user_doc/guide/task/map-reduce.html
index 6a952838f..8ed28894e 100644
--- a/en-us/docs/dev/user_doc/guide/task/map-reduce.html
+++ b/en-us/docs/dev/user_doc/guide/task/map-reduce.html
@@ -59,7 +59,7 @@
<h3>Execute the WordCount Program</h3>
<p>This example is a common introductory type of MapReduce application, which
used to count the number of identical words in the input text.</p>
<h4>Configure the MapReduce Environment in DolphinScheduler</h4>
-<p>If you are using the MapReduce task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file:
<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>.</p>
+<p>If you are using the MapReduce task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file: <code>bin/env/dolphinscheduler_env.sh</code>.</p>
<p><img src="/img/tasks/demo/mr_task01.png" alt="mr_configure"></p>
<h4>Upload the Main Package</h4>
<p>When using the MapReduce task node, you need to use the Resource Centre to
upload the jar package for the execution. Refer to the <a
href="../resource.md">resource centre</a>.</p>
diff --git a/en-us/docs/dev/user_doc/guide/task/map-reduce.json
b/en-us/docs/dev/user_doc/guide/task/map-reduce.json
index 519b44b3f..f12dc2974 100644
--- a/en-us/docs/dev/user_doc/guide/task/map-reduce.json
+++ b/en-us/docs/dev/user_doc/guide/task/map-reduce.json
@@ -1,6 +1,6 @@
{
"filename": "map-reduce.md",
- "__html": "<h1>MapReduce Node</h1>\n<h2>Overview</h2>\n<p>MapReduce(MR) task
type used for executing MapReduce programs. For MapReduce nodes, the worker
submits the task by using the Hadoop command <code>hadoop jar</code>. See <a
href=\"https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CommandsManual.html#jar\";>Hadoop
Command Manual</a> for more details.</p>\n<h2>Create
Task</h2>\n<ul>\n<li>Click <code>Project -> Management-Project ->
Name-Workflow Definiti [...]
+ "__html": "<h1>MapReduce Node</h1>\n<h2>Overview</h2>\n<p>MapReduce(MR) task
type used for executing MapReduce programs. For MapReduce nodes, the worker
submits the task by using the Hadoop command <code>hadoop jar</code>. See <a
href=\"https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CommandsManual.html#jar\";>Hadoop
Command Manual</a> for more details.</p>\n<h2>Create
Task</h2>\n<ul>\n<li>Click <code>Project -> Management-Project ->
Name-Workflow Definiti [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/map-reduce.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/spark.html
b/en-us/docs/dev/user_doc/guide/task/spark.html
index afa4646f9..6115feae4 100644
--- a/en-us/docs/dev/user_doc/guide/task/spark.html
+++ b/en-us/docs/dev/user_doc/guide/task/spark.html
@@ -50,7 +50,7 @@
<h3>Execute the WordCount Program</h3>
<p>This is a common introductory case in the big data ecosystem, which often
apply to computational frameworks such as MapReduce, Flink and Spark. The main
purpose is to count the number of identical words in the input text. (Flink's
releases attach this example job)</p>
<h4>Configure the Spark Environment in DolphinScheduler</h4>
-<p>If you are using the Spark task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file:
<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>.</p>
+<p>If you are using the Spark task type in a production environment, it is
necessary to configure the required environment first. The following is the
configuration file: <code>bin/env/dolphinscheduler_env.sh</code>.</p>
<p><img src="/img/tasks/demo/spark_task01.png" alt="spark_configure"></p>
<h4>Upload the Main Package</h4>
<p>When using the Spark task node, you need to upload the jar package to the
Resource Centre for the execution, refer to the <a
href="../resource.md">resource center</a>.</p>
diff --git a/en-us/docs/dev/user_doc/guide/task/spark.json
b/en-us/docs/dev/user_doc/guide/task/spark.json
index fb4d71adb..d51ade714 100644
--- a/en-us/docs/dev/user_doc/guide/task/spark.json
+++ b/en-us/docs/dev/user_doc/guide/task/spark.json
@@ -1,6 +1,6 @@
{
"filename": "spark.md",
- "__html": "<h1>Spark Node</h1>\n<h2>Overview</h2>\n<p>Spark task type used
to execute Spark program. For Spark nodes, the worker submits the task by using
the spark command <code>spark submit</code>. See <a
href=\"https://spark.apache.org/docs/3.2.1/submitting-applications.html#launching-applications-with-spark-submit\";>spark-submit</a>
for more details.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click <code>Project
-> Management-Project -> Name-Workflow Definition</code>, and click th
[...]
+ "__html": "<h1>Spark Node</h1>\n<h2>Overview</h2>\n<p>Spark task type used
to execute Spark program. For Spark nodes, the worker submits the task by using
the spark command <code>spark submit</code>. See <a
href=\"https://spark.apache.org/docs/3.2.1/submitting-applications.html#launching-applications-with-spark-submit\";>spark-submit</a>
for more details.</p>\n<h2>Create Task</h2>\n<ul>\n<li>Click <code>Project
-> Management-Project -> Name-Workflow Definition</code>, and click th
[...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/spark.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/release/faq.html b/en-us/docs/release/faq.html
index e5b90042f..6734c0205 100644
--- a/en-us/docs/release/faq.html
+++ b/en-us/docs/release/faq.html
@@ -156,7 +156,7 @@ version 1.3 not use grpc, we use netty directly</p>
<p> 4, you can define DAG editing for the process, set the running flag
of some tasks to <strong>prohibit running</strong>, when the process definition
is started, the connection of the node will be removed from the DAG.</p>
<hr>
<h2>Q : Python task setting Python version</h2>
-<p>A: 1，<strong>for the version after 1.0.3</strong> only need to modify
PYTHON_HOME in conf/env/.dolphinscheduler_env.sh</p>
+<p>A: 1，<strong>for the version after 1.0.3</strong> only need to modify
PYTHON_HOME in <code>bin/env/dolphinscheduler_env.sh</code></p>
<pre><code>export PYTHON_HOME=/bin/python
</code></pre>
<p>Note: This is <strong>PYTHON_HOME</strong> , which is the absolute path of
the python command, not the simple PYTHON_HOME. Also note that when exporting
the PATH, you need to directly</p>
diff --git a/en-us/docs/release/faq.json b/en-us/docs/release/faq.json
index bbbd41557..ad0482c2b 100644
--- a/en-us/docs/release/faq.json
+++ b/en-us/docs/release/faq.json
@@ -1,6 +1,6 @@
{
"filename": "faq.md",
- "__html": "<!-- markdown-link-check-disable -->\n<h2>Q: What's the name of
this project?</h2>\n<p>A: DolphinScheduler</p>\n<hr>\n<h2>Q: DolphinScheduler
service introduction and recommended running memory</h2>\n<p>A:
DolphinScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer,
AlertServer, LoggerServer and
UI.</p>\n<table>\n<thead>\n<tr>\n<th>Service</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>Mainly
responsible for DAG segm [...]
+ "__html": "<!-- markdown-link-check-disable -->\n<h2>Q: What's the name of
this project?</h2>\n<p>A: DolphinScheduler</p>\n<hr>\n<h2>Q: DolphinScheduler
service introduction and recommended running memory</h2>\n<p>A:
DolphinScheduler consists of 5 services, MasterServer, WorkerServer, ApiServer,
AlertServer, LoggerServer and
UI.</p>\n<table>\n<thead>\n<tr>\n<th>Service</th>\n<th>Description</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>Mainly
responsible for DAG segm [...]
"link": "/dist/en-us/docs/release/faq.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/development/development-environment-setup.html
b/zh-cn/development/development-environment-setup.html
index c44fe8171..05c53f8a8 100644
--- a/zh-cn/development/development-environment-setup.html
+++ b/zh-cn/development/development-environment-setup.html
@@ -51,11 +51,11 @@ Standalone 仅在 DolphinScheduler 1.3.9 及以后的版本支持</p>
<p>在 Intellij IDEA 找到并启动类
<code>org.apache.dolphinscheduler.server.StandaloneServer</code> 即可完成后端启动</p>
<h3>启动前端</h3>
<p>安装前端依赖并运行前端组件</p>
-<pre><code class="language-shell">cd dolphinscheduler-ui
-npm install
-npm run start
+<pre><code class="language-shell">cd dolphinscheduler-ui-next
+pnpm install
+pnpm run dev
</code></pre>
-<p>截止目前，前后端已成功运行起来，浏览器访问<a
href="http://localhost:8888";>http://localhost:8888</a>，并使用默认账户密码
<strong>admin/dolphinscheduler123</strong> 即可完成登录</p>
+<p>截止目前，前后端已成功运行起来，浏览器访问<a
href="http://localhost:3000";>http://localhost:3000</a>，并使用默认账户密码
<strong>admin/dolphinscheduler123</strong> 即可完成登录</p>
<h2>DolphinScheduler 普通开发模式</h2>
<h3>必要软件安装</h3>
<h4>zookeeper</h4>
@@ -135,11 +135,11 @@
dolphinscheduler-service/src/main/resources/registry.properties</li>
</blockquote>
<h3>启动前端</h3>
<p>安装前端依赖并运行前端组件</p>
-<pre><code class="language-shell">cd dolphinscheduler-ui
-npm install
-npm run start
+<pre><code class="language-shell">cd dolphinscheduler-ui-next
+pnpm install
+pnpm run dev
</code></pre>
-<p>截止目前，前后端已成功运行起来，浏览器访问<a
href="http://localhost:8888";>http://localhost:8888</a>，并使用默认账户密码
<strong>admin/dolphinscheduler123</strong> 即可完成登录</p>
+<p>截止目前，前后端已成功运行起来，浏览器访问<a
href="http://localhost:3000";>http://localhost:3000</a>，并使用默认账户密码
<strong>admin/dolphinscheduler123</strong> 即可完成登录</p>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/development/development-environment-setup.json
b/zh-cn/development/development-environment-setup.json
index 82b8aa01b..d1b65078c 100644
--- a/zh-cn/development/development-environment-setup.json
+++ b/zh-cn/development/development-environment-setup.json
@@ -1,6 +1,6 @@
{
"filename": "development-environment-setup.md",
- "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>前置条件</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装一下软件</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a>: 版本控制系统</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
后端开发</li>\n<li><a href=\"http://maven.apache.org/download.cgi\";>Maven</a>:
Java包管理系统</li>\n<li><a href=\"https://nodejs.org/en/download\";>Node</a>:
前端开发</li>\n</ul>\n<h3>克隆代码库</h3>\n<p>通过你 git 管理工具下载 git 代码，下面以 git-co [...]
+ "__html": "<h1>DolphinScheduler 开发手册</h1>\n<h2>前置条件</h2>\n<p>在搭建
DolphinScheduler 开发环境之前请确保你已经安装一下软件</p>\n<ul>\n<li><a
href=\"https://git-scm.com/downloads\";>Git</a>: 版本控制系统</li>\n<li><a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JDK</a>:
后端开发</li>\n<li><a href=\"http://maven.apache.org/download.cgi\";>Maven</a>:
Java包管理系统</li>\n<li><a href=\"https://nodejs.org/en/download\";>Node</a>:
前端开发</li>\n</ul>\n<h3>克隆代码库</h3>\n<p>通过你 git 管理工具下载 git 代码，下面以 git-co [...]
"link": "/dist/zh-cn/development/development-environment-setup.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.html
b/zh-cn/docs/dev/user_doc/architecture/configuration.html
index 3c4ff9a1d..af46b7592 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.html
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.html
@@ -940,20 +940,39 @@ alertServer=<span
class="hljs-string">"ds3"</span>
apiServers=<span class="hljs-string">"ds1"</span>
</code></pre>
<h2>11.dolphinscheduler_env.sh [环境变量配置]</h2>
-<p>通过类似shell方式提交任务的的时候,会加载该配置文件中的环境变量到主机中.
-涉及到的任务类型有: Shell任务、Python任务、Spark任务、Flink任务、Datax任务等等</p>
-<pre><code class="language-bash"><span class="hljs-built_in">export</span>
HADOOP_HOME=/opt/soft/hadoop
-<span class="hljs-built_in">export</span>
HADOOP_CONF_DIR=/opt/soft/hadoop/etc/hadoop
-<span class="hljs-built_in">export</span> SPARK_HOME1=/opt/soft/spark1
-<span class="hljs-built_in">export</span> SPARK_HOME2=/opt/soft/spark2
-<span class="hljs-built_in">export</span> PYTHON_HOME=/opt/soft/python
-<span class="hljs-built_in">export</span> JAVA_HOME=/opt/soft/java
-<span class="hljs-built_in">export</span> HIVE_HOME=/opt/soft/hive
-<span class="hljs-built_in">export</span> FLINK_HOME=/opt/soft/flink
-<span class="hljs-built_in">export</span>
DATAX_HOME=/opt/soft/datax/bin/datax.py
-
-<span class="hljs-built_in">export</span> PATH=<span
class="hljs-variable">$HADOOP_HOME</span>/bin:<span
class="hljs-variable">$SPARK_HOME1</span>/bin:<span
class="hljs-variable">$SPARK_HOME2</span>/bin:<span
class="hljs-variable">$PYTHON_HOME</span>:<span
class="hljs-variable">$JAVA_HOME</span>/bin:<span
class="hljs-variable">$HIVE_HOME</span>/bin:<span
class="hljs-variable">$PATH</span>:<span
class="hljs-variable">$FLINK_HOME</span>/bin:<span
class="hljs-variable">$DATAX_HOME</span>:<s [...]
+<p>通过类似shell方式提交任务的的时候,会加载该配置文件中的环境变量到主机中. 涉及到的
<code>JAVA_HOME</code>、元数据库、注册中心和任务类型配置，其中任务
+类型主要有: Shell任务、Python任务、Spark任务、Flink任务、Datax任务等等</p>
+<pre><code class="language-bash"><span class="hljs-comment"># JAVA_HOME, will
use it to start DolphinScheduler server</span>
+<span class="hljs-built_in">export</span> JAVA_HOME=<span
class="hljs-variable">${JAVA_HOME:-/opt/soft/java}</span>
+<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
+<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
+<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_DRIVER_CLASS_NAME
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD
+
+<span class="hljs-comment"># DolphinScheduler server related
configuration</span>
+<span class="hljs-built_in">export</span> SPRING_CACHE_TYPE=<span
class="hljs-variable">${SPRING_CACHE_TYPE:-none}</span>
+<span class="hljs-built_in">export</span> SPRING_JACKSON_TIME_ZONE=<span
class="hljs-variable">${SPRING_JACKSON_TIME_ZONE:-UTC}</span>
+<span class="hljs-built_in">export</span> MASTER_FETCH_COMMAND_NUM=<span
class="hljs-variable">${MASTER_FETCH_COMMAND_NUM:-10}</span>
+
+<span class="hljs-comment"># Registry center configuration, determines the
type and link of the registry center</span>
+<span class="hljs-built_in">export</span> REGISTRY_TYPE=<span
class="hljs-variable">${REGISTRY_TYPE:-zookeeper}</span>
+<span class="hljs-built_in">export</span>
REGISTRY_ZOOKEEPER_CONNECT_STRING=<span
class="hljs-variable">${REGISTRY_ZOOKEEPER_CONNECT_STRING:-localhost:2181}</span>
+
+<span class="hljs-comment"># Tasks related configurations, need to change the
configuration if you use the related tasks.</span>
+<span class="hljs-built_in">export</span> HADOOP_HOME=<span
class="hljs-variable">${HADOOP_HOME:-/opt/soft/hadoop}</span>
+<span class="hljs-built_in">export</span> HADOOP_CONF_DIR=<span
class="hljs-variable">${HADOOP_CONF_DIR:-/opt/soft/hadoop/etc/hadoop}</span>
+<span class="hljs-built_in">export</span> SPARK_HOME1=<span
class="hljs-variable">${SPARK_HOME1:-/opt/soft/spark1}</span>
+<span class="hljs-built_in">export</span> SPARK_HOME2=<span
class="hljs-variable">${SPARK_HOME2:-/opt/soft/spark2}</span>
+<span class="hljs-built_in">export</span> PYTHON_HOME=<span
class="hljs-variable">${PYTHON_HOME:-/opt/soft/python}</span>
+<span class="hljs-built_in">export</span> HIVE_HOME=<span
class="hljs-variable">${HIVE_HOME:-/opt/soft/hive}</span>
+<span class="hljs-built_in">export</span> FLINK_HOME=<span
class="hljs-variable">${FLINK_HOME:-/opt/soft/flink}</span>
+<span class="hljs-built_in">export</span> DATAX_HOME=<span
class="hljs-variable">${DATAX_HOME:-/opt/soft/datax}</span>
+
+<span class="hljs-built_in">export</span> PATH=<span
class="hljs-variable">$HADOOP_HOME</span>/bin:<span
class="hljs-variable">$SPARK_HOME1</span>/bin:<span
class="hljs-variable">$SPARK_HOME2</span>/bin:<span
class="hljs-variable">$PYTHON_HOME</span>/bin:<span
class="hljs-variable">$JAVA_HOME</span>/bin:<span
class="hljs-variable">$HIVE_HOME</span>/bin:<span
class="hljs-variable">$FLINK_HOME</span>/bin:<span
class="hljs-variable">$DATAX_HOME</span>/bin:<span
class="hljs-variable">$PATH</span>
</code></pre>
<h2>12.各服务日志配置文件</h2>
<table>
diff --git a/zh-cn/docs/dev/user_doc/architecture/configuration.json
b/zh-cn/docs/dev/user_doc/architecture/configuration.json
index 64c7a6d55..dc221d5aa 100644
--- a/zh-cn/docs/dev/user_doc/architecture/configuration.json
+++ b/zh-cn/docs/dev/user_doc/architecture/configuration.json
@@ -1,6 +1,6 @@
{
"filename": "configuration.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>\n├─bin
DS命令存放目录\n│ ├─dolphinscheduler-daemon.sh 启动/关闭DS服务脚本\n│
├─start-all.sh [...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h1>前言</h1>\n<p>本文档为dolphinscheduler配置文件说明文档,针对版本为 dolphinscheduler-1.3.x
版本.</p>\n<h1>目录结构</h1>\n<p>目前dolphinscheduler 所有的配置文件都在 [conf ]
目录中.\n为了更直观的了解[conf]目录所在的位置以及包含的配置文件,请查看下面dolphinscheduler安装目录的简化说明.\n本文主要讲述dolphinscheduler的配置文件.其他部分先不做赘述.</p>\n<p>[注:以下
dolphinscheduler 简称为DS.]</p>\n<pre><code>\n├─bin
DS命令存放目录\n│ ├─dolphinscheduler-daemon.sh 启动/关闭DS服务脚本\n│
├─start-all.sh [...]
"link": "/dist/zh-cn/docs/dev/user_doc/architecture/configuration.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html
b/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html
index b9992f663..07b32388a 100644
--- a/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html
+++ b/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html
@@ -68,7 +68,7 @@ sed -i 's/Defaults requirett/#Defaults
requirett/g' /etc/sudoers
datasource.properties 中的数据库连接信息.
zookeeper.properties 中的连接zk的信息.
common.properties
中关于资源存储的配置信息(如果设置了hadoop,请检查是否存在core-site.xml和hdfs-site.xml配置文件).
-env/dolphinscheduler<span class="hljs-emphasis">_env.sh 中的环境变量
+dolphinscheduler<span class="hljs-emphasis">_env.sh 中的环境变量
</span></code></pre>
</li>
<li>
diff --git a/zh-cn/docs/dev/user_doc/guide/expansion-reduction.json
b/zh-cn/docs/dev/user_doc/guide/expansion-reduction.json
index 95b127bb1..130fb80c3 100644
--- a/zh-cn/docs/dev/user_doc/guide/expansion-reduction.json
+++ b/zh-cn/docs/dev/user_doc/guide/expansion-reduction.json
@@ -1,6 +1,6 @@
{
"filename": "expansion-reduction.md",
- "__html": "<h1>DolphinScheduler扩容/缩容 文档</h1>\n<h2>1.
DolphinScheduler扩容文档</h2>\n<p>本文扩容是针对现有的DolphinScheduler集群添加新的master或者worker节点的操作说明.</p>\n<pre><code>
注意： 一台物理机上不能存在多个master服务进程或者worker服务进程.\n
如果扩容master或者worker节点所在的物理机已经安装了调度的服务,请直接跳到 [1.4.修改配置]. 编辑 ** 所有 ** 节点上的配置文件
`conf/config/install_config.conf`.
新增masters或者workers参数,重启调度集群即可.\n</code></pre>\n<h3>1.1.
基础软件安装(必装项请自行安装)</h3>\n<ul>\n<li>[必装] <a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JD
[...]
+ "__html": "<h1>DolphinScheduler扩容/缩容 文档</h1>\n<h2>1.
DolphinScheduler扩容文档</h2>\n<p>本文扩容是针对现有的DolphinScheduler集群添加新的master或者worker节点的操作说明.</p>\n<pre><code>
注意： 一台物理机上不能存在多个master服务进程或者worker服务进程.\n
如果扩容master或者worker节点所在的物理机已经安装了调度的服务,请直接跳到 [1.4.修改配置]. 编辑 ** 所有 ** 节点上的配置文件
`conf/config/install_config.conf`.
新增masters或者workers参数,重启调度集群即可.\n</code></pre>\n<h3>1.1.
基础软件安装(必装项请自行安装)</h3>\n<ul>\n<li>[必装] <a
href=\"https://www.oracle.com/technetwork/java/javase/downloads/index.html\";>JD
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/cluster.html
b/zh-cn/docs/dev/user_doc/guide/installation/cluster.html
index 2e8c40670..8b3a8472c 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/cluster.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/cluster.html
@@ -14,11 +14,11 @@
<p>集群部署目的是在多台机器部署 DolphinScheduler 服务，用于运行大量任务情况。</p>
<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href="standalone.md">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href="pseudo-cluster.md">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href="cluster.md">集群部署</a>或者<a href="kubernetes.md">kubernetes</a></p>
<h2>部署步骤</h2>
-<p>集群部署(Cluster)使用的脚本和配置文件与<a
href="pseudo-cluster.md">伪集群部署</a>中的配置一样，所以所需要的步骤也与<a
href="pseudo-cluster.md">伪集群部署</a>大致一样。区别就是<a
href="pseudo-cluster.md">伪集群部署</a>针对的是一台机器，而集群部署(Cluster)需要针对多台机器，且两者“修改相关配置”步骤区别较大</p>
+<p>集群部署(Cluster)使用的脚本和配置文件与<a
href="pseudo-cluster.md">伪集群部署</a>中的配置一样，所以所需要的步骤也与伪集群部署大致一样。区别就是伪集群部署针对的是一台机器，而集群部署(Cluster)需要针对多台机器，且两者“修改相关配置”步骤区别较大</p>
<h3>前置准备工作 && 准备 DolphinScheduler 启动环境</h3>
<p>其中除了<a
href="pseudo-cluster.md">伪集群部署</a>中的“前置准备工作”，“准备启动环境”除了“启动zookeeper”以及“初始化数据库”外，别的都需要在每台机器中进行配置</p>
<h3>修改相关配置</h3>
-<p>这个是与<a href="pseudo-cluster.md">伪集群部署</a>差异较大的一步，因为部署脚本会通过 <code>scp</code>
的方式将安装需要的资源传输到各个机器上，所以这一步我们仅需要修改运行<code>install.sh</code>脚本的所在机器的配置即可。配置文件在路径在<code>conf/config/install_config.conf</code>下，此处我们仅需修改<strong>INSTALL
MACHINE</strong>，<strong>DolphinScheduler ENV、Database、Registry
Server</strong>与<a href="pseudo-cluster.md">伪集群部署</a>保持一致，下面对必须修改参数进行说明</p>
+<p>这个是与<a href="pseudo-cluster.md">伪集群部署</a>差异较大的一步，因为部署脚本会通过 <code>scp</code>
的方式将安装需要的资源传输到各个机器上，所以这一步我们仅需要修改运行<code>install.sh</code>脚本的所在机器的配置即可。配置文件在路径在<code>conf/config/install_config.conf</code>下，此处我们仅需修改<strong>INSTALL
MACHINE</strong>，<strong>DolphinScheduler ENV、Database、Registry
Server</strong>与伪集群部署保持一致，下面对必须修改参数进行说明</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> ---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> INSTALL MACHINE</span>
<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/cluster.json
b/zh-cn/docs/dev/user_doc/guide/installation/cluster.json
index 9c82f65ff..8d751b06f 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/cluster.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/cluster.json
@@ -1,6 +1,6 @@
{
"filename": "cluster.md",
- "__html": "<h1>集群部署(Cluster)</h1>\n<p>集群部署目的是在多台机器部署 DolphinScheduler
服务，用于运行大量任务情况。</p>\n<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>部署步骤</h2>\n<p>集群部署(Cluster)使用的脚本和配置文件与<a
href=\"pseudo-cluster.md\">伪集群部署</a>中的配置一样，所以所需要的步骤也与<a
href=\"pseudo-cluster.md\">伪集群部署</a>大致一样。区别就是<a href=\ [...]
+ "__html": "<h1>集群部署(Cluster)</h1>\n<p>集群部署目的是在多台机器部署 DolphinScheduler
服务，用于运行大量任务情况。</p>\n<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>部署步骤</h2>\n<p>集群部署(Cluster)使用的脚本和配置文件与<a
href=\"pseudo-cluster.md\">伪集群部署</a>中的配置一样，所以所需要的步骤也与伪集群部署大致一样。区别就是伪集群部署针对的是一台机器，而集群部署(Cluster)需要针对多台机器，且两者“修改
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/installation/cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index c89dd4981..6e4f81060 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -87,45 +87,43 @@ sh script/create-dolphinscheduler.sh
```
-->
<h2>修改相关配置</h2>
-<p>完成了基础环境的准备后，在运行部署命令前，还需要根据环境修改配置文件。配置文件在路径在<code>conf/config/install_config.conf</code>下，一般部署只需要修改<strong>INSTALL
MACHINE、DolphinScheduler ENV、Database、Registry
Server</strong>部分即可完成部署，下面对必须修改参数进行说明</p>
+<p>完成基础环境的准备后，需要根据你的机器环境修改配置文件。配置文件可以在目录 <code>bin/env</code> 中找到，他们分别是 并命名为
<code>install_env.sh</code> 和 <code>dolphinscheduler_env.sh</code>。</p>
+<h3>修改 <code>install_env.sh</code> 文件</h3>
+<p>文件 <code>install_env.sh</code> 描述了哪些机器将被安装 DolphinScheduler
以及每台机器对应安装哪些服务。您可以在路径 <code>bin/env/install_env.sh</code> 中找到此文件，配置详情如下。</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> ---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> INSTALL MACHINE</span>
<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash">
因为是在单节点上部署master、worker、API server，所以服务器的IP均为机器IP或者localhost</span>
+<span class="hljs-meta">#</span><span class="bash"> Due to the master, worker,
and API server being deployed on a single node, the IP of the server is the
machine IP or localhost</span>
ips="localhost"
masters="localhost"
workers="localhost:default"
alertServer="localhost"
apiServers="localhost"
<span class="hljs-meta">
-#</span><span class="bash"> DolphinScheduler安装路径，如果不存在会创建</span>
+#</span><span class="bash"> DolphinScheduler installation path, it will
auto-create <span class="hljs-keyword">if</span> not exists</span>
installPath="~/dolphinscheduler"
<span class="hljs-meta">
-#</span><span class="bash"> 部署用户，填写在 **配置用户免密及权限** 中创建的用户</span>
+#</span><span class="bash"> Deploy user, use the user you create <span
class="hljs-keyword">in</span> section **Configure machine SSH password-free
login**</span>
deployUser="dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> DolphinScheduler ENV</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> JAVA_HOME 的路径，是在
**前置准备工作** 安装的JDK中 JAVA_HOME 所在的位置</span>
-javaHome="/your/java/home/here"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Database</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash">
数据库的类型，用户名，密码，IP，端口，元数据库db。其中dbtype目前支持 mysql 和 postgresql</span>
-dbtype="mysql"
-dbhost="localhost:3306"
-<span class="hljs-meta">#</span><span class="bash"> 如果你不是以
dolphinscheduler/dolphinscheduler 作为用户名和密码的，需要进行修改</span>
-username="dolphinscheduler"
-password="dolphinscheduler"
-dbname="dolphinscheduler"
-<span class="hljs-meta">
-#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash"> Registry Server</span>
-<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
-<span class="hljs-meta">#</span><span class="bash">
注册中心地址，zookeeper服务的地址</span>
-registryServers="localhost:2181"
+</code></pre>
+<h3>修改 <code>dolphinscheduler_env.sh</code> 文件</h3>
+<p>文件 <code>dolphinscheduler_env.sh</code> 描述了 DolphinScheduler
的数据库配置，一些任务类型外部依赖路径或库文件，注册中心，其中 <code>JAVA_HOME</code>
+和 <code>SPARK_HOME</code>都是在这里定义的，其路径是
<code>bin/env/dolphinscheduler_env.sh</code>。如果您不使用某些任务类型，您可以忽略任务外部依赖项，
+但您必须根据您的环境更改 <code>JAVA_HOME</code>、注册中心和数据库相关配置。</p>
+<pre><code class="language-sh"><span class="hljs-comment"># JAVA_HOME, will
use it to start DolphinScheduler server</span>
+<span class="hljs-built_in">export</span> JAVA_HOME=<span
class="hljs-variable">${JAVA_HOME:-/custom/path}</span>
+
+<span class="hljs-comment"># Database related configuration, set database
type, username and password</span>
+<span class="hljs-built_in">export</span> DATABASE=<span
class="hljs-variable">${DATABASE:-postgresql}</span>
+<span class="hljs-built_in">export</span> SPRING_PROFILES_ACTIVE=<span
class="hljs-variable">${DATABASE}</span>
+<span class="hljs-built_in">export</span>
SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_URL=<span
class="hljs-string">"jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_USERNAME=<span
class="hljs-string">"username"</span>
+<span class="hljs-built_in">export</span> SPRING_DATASOURCE_PASSWORD=<span
class="hljs-string">"password"</span>
+
+<span class="hljs-comment"># Registry center configuration, determines the
type and link of the registry center</span>
+<span class="hljs-built_in">export</span> REGISTRY_TYPE=<span
class="hljs-variable">${REGISTRY_TYPE:-zookeeper}</span>
+<span class="hljs-built_in">export</span>
REGISTRY_ZOOKEEPER_CONNECT_STRING=<span
class="hljs-variable">${REGISTRY_ZOOKEEPER_CONNECT_STRING:-localhost:2181}</span>
</code></pre>
<h2>初始化数据库</h2>
<p>DolphinScheduler 元数据存储在关系型数据库中，目前支持 PostgreSQL 和 MySQL，如果使用 MySQL 则需要手动下载
<a href="https://downloads.MySQL.com/archives/c-j/";>mysql-connector-java 驱动</a>
(8.0.16) 并移动到 DolphinScheduler 的 lib目录下（<code>tools/libs/</code>）。下面以 MySQL
为例，说明如何初始化数据库</p>
@@ -159,7 +157,7 @@ mysql></span><span class="bash"> CREATE DATABASE
dolphinscheduler DEFAULT CHA
</code></pre>
<h2>启动 DolphinScheduler</h2>
<p>使用上面创建的<strong>部署用户</strong>运行以下命令完成部署，部署后的运行日志将存放在 logs 文件夹内</p>
-<pre><code class="language-shell">sh install.sh
+<pre><code class="language-shell">sh ./bin/install.sh
</code></pre>
<blockquote>
<p><strong><em>注意:</em></strong> 第一次部署的话，可能出现 5 次<code>sh:
bin/dolphinscheduler-daemon.sh: No such file or
directory</code>相关信息，次为非重要信息直接忽略即可</p>
@@ -190,7 +188,14 @@ sh ./bin/dolphinscheduler-daemon.sh start alert-server
sh ./bin/dolphinscheduler-daemon.sh stop alert-server
</code></pre>
<blockquote>
-<p><strong><em>注意:</em></strong>：服务用途请具体参见《系统架构设计》小节</p>
+<p><strong><em>注意1:</em></strong>: 每个服务在路径
<code><server-name>/conf/dolphinscheduler_env.sh</code> 中都有
<code>dolphinscheduler_env.sh</code> 文件，这是可以为微
+服务需求提供便利。意味着您可以基于不同的环境变量来启动各个服务，只需要在对应服务中配置
<code>bin/env/dolphinscheduler_env.sh</code> 然后通过
<code><server-name>/bin/start.sh</code>
+命令启动即可。但是如果您使用命令 <code>/bin/dolphinscheduler-daemon.sh start
<server-name></code> 启动服务器，它将会用文件
<code>bin/env/dolphinscheduler_env.sh</code>
+覆盖 <code><server-name>/conf/dolphinscheduler_env.sh</code>
然后启动服务，目的是为了减少用户修改配置的成本.</p>
+</blockquote>
+<blockquote>
+<p><strong><em>注意2:</em></strong>：服务用途请具体参见《系统架构设计》小节。Python gateway service
默认与 api-server 一起启动，如果您不想启动 Python gateway service
+请通过更改 api-server 配置文件 <code>api-server/conf/application.yaml</code> 中的
<code>python-gateway.enabled : false</code> 来禁用它。</p>
</blockquote>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index 1f0531ee8..63fc378eb 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
+ "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
"link":
"/dist/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
b/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
index b84c04c14..f3af33ea8 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/standalone.html
@@ -14,7 +14,8 @@
<p>Standalone 仅适用于 DolphinScheduler 的快速体验.</p>
<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href="standalone.md">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href="pseudo-cluster.md">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href="cluster.md">集群部署</a>或者<a href="kubernetes.md">kubernetes</a></p>
<blockquote>
-<p><strong><em>注意:</em></strong> Standalone仅建议20个以下工作流使用，因为其采用 H2 Database,
Zookeeper Testing Server，任务过多可能导致不稳定</p>
+<p><strong><em>注意:</em></strong> Standalone仅建议20个以下工作流使用，因为其采用内存式的H2 Database,
Zookeeper Testing Server，任务过多可能导致不稳定，并且如果重启或者停止standalone-server会导致内存中数据库里的数据清空。
+如果您要连接外部数据库，比如mysql或者postgresql，请看<a
href="#%E9%85%8D%E7%BD%AE%E6%95%B0%E6%8D%AE%E5%BA%93">配置数据库</a></p>
</blockquote>
<h2>前置准备工作</h2>
<ul>
@@ -38,6 +39,25 @@ sh ./bin/dolphinscheduler-daemon.sh start standalone-server
<span class="hljs-meta">#</span><span class="bash"> 停止 Standalone Server
服务</span>
sh ./bin/dolphinscheduler-daemon.sh stop standalone-server
</code></pre>
+<h3>配置数据库</h3>
+<ul>
+<li>这里以mysql为例介绍如何连接外部数据库</li>
+<li>首先，参照 <a href="pseudo-cluster.md">伪集群部署</a> <code>初始化数据库</code>
创建并初始化数据库</li>
+<li>在你的命令行设定下列环境变量，将{user}和{password}改为你数据库的用户名和密码</li>
+</ul>
+<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
+export SPRING_PROFILES_ACTIVE=${DATABASE}
+export SPRING_DATASOURCE_USERNAME={user}
+export SPRING_DATASOURCE_PASSWORD={password}
+</code></pre>
+<ul>
+<li>
+<p>将mysql-connector-java驱动加到<code>./standalone-server/libs/standalone-server/</code>目录下,
下载方法见 <a href="pseudo-cluster.md">伪集群部署</a> <code>初始化数据库</code> 一栏</p>
+</li>
+<li>
+<p>启动standalone-server，此时你已经连接上mysql，重启或者停止standalone-server并不会清空您数据库里的数据</p>
+</li>
+</ul>
</div></section><footer class="footer-container"><div
class="footer-body"><div><h3>联系我们</h3><h4>有问题需要反馈？请通过以下方式联系我们。</h4></div><div
class="contact-container"><ul><li><a
href="/zh-cn/community/development/subscribe.html"><img class="img-base"
src="/img/emailgray.png"/><img class="img-change"
src="/img/emailblue.png"/><p>邮件列表</p></a></li><li><a
href="https://twitter.com/dolphinschedule";><img class="img-base"
src="/img/twittergray.png"/><img class="img-change"
src="/img/twitterblue.png"/><p [...]
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-with-addons.min.js"></script>
<script
src="//cdn.jsdelivr.net/npm/[email protected]/dist/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
b/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
index 6808f4256..2b9ee2290 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/standalone.json
@@ -1,6 +1,6 @@
{
"filename": "standalone.md",
- "__html": "<h1>Standalone极速体验版</h1>\n<p>Standalone 仅适用于 DolphinScheduler
的快速体验.</p>\n<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<blockquote>\n<p><strong><em>注意:</em></strong>
Standalone仅建议20个以下工作流使用，因为其采用 H2 Database, Zookeeper Testing
Server，任务过多可能导致不稳定</p>\n</blockquote>\n<h2>前置准备工作</h [...]
+ "__html": "<h1>Standalone极速体验版</h1>\n<p>Standalone 仅适用于 DolphinScheduler
的快速体验.</p>\n<p>如果你是新手，想要体验 DolphinScheduler 的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<blockquote>\n<p><strong><em>注意:</em></strong>
Standalone仅建议20个以下工作流使用，因为其采用内存式的H2 Database, Zookeeper Testing
Server，任务过多可能导致不稳定，并且如果重启或者停止standalone-server会导致 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/installation/standalone.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/datax.html
b/zh-cn/docs/dev/user_doc/guide/task/datax.html
index fd52b9c53..248e6c0b8 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/datax.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/datax.html
@@ -46,7 +46,7 @@
<h2>任务样例</h2>
<p>该样例演示为从 Hive 数据导入到 MySQL 中。</p>
<h3>在 DolphinScheduler 中配置 DataX 环境</h3>
-<p>若生产环境中要是使用到 DataX
任务类型，则需要先配置好所需的环境。配置文件如下：<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>。</p>
+<p>若生产环境中要是使用到 DataX
任务类型，则需要先配置好所需的环境。配置文件如下：<code>bin/env/dolphinscheduler_env.sh</code>。</p>
<p><img src="/img/tasks/demo/datax_task01.png" alt="datax_task01"></p>
<p align="center">
<img src="/img/datax_edit.png" width="80%" />
diff --git a/zh-cn/docs/dev/user_doc/guide/task/datax.json
b/zh-cn/docs/dev/user_doc/guide/task/datax.json
index ec89ea926..3aa4f7bf2 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/datax.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/datax.json
@@ -1,6 +1,6 @@
{
"filename": "datax.md",
- "__html": "<h1>DATAX 节点</h1>\n<h2>综述</h2>\n<p>DataX 任务类型，用于执行 DataX 程序。对于
DataX 节点，worker 会通过执行 <code>${DATAX_HOME}/bin/datax.py</code> 来解析传入的 json
文件。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理 -> 项目名称 -> 工作流定义，点击“创建工作流”按钮，进入
DAG 编辑页面；</li>\n<li>拖动工具栏的<img src=\"/img/tasks/icons/datax.png\"
width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务节点的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。</li>\n<li>描述：描述该节点的功能。</li>\n<li>任务优先级：worker
线程数不足 [...]
+ "__html": "<h1>DATAX 节点</h1>\n<h2>综述</h2>\n<p>DataX 任务类型，用于执行 DataX 程序。对于
DataX 节点，worker 会通过执行 <code>${DATAX_HOME}/bin/datax.py</code> 来解析传入的 json
文件。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理 -> 项目名称 -> 工作流定义，点击“创建工作流”按钮，进入
DAG 编辑页面；</li>\n<li>拖动工具栏的<img src=\"/img/tasks/icons/datax.png\"
width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务节点的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标识这个结点是否能正常调度，如果不需要执行，可以打开禁止执行开关。</li>\n<li>描述：描述该节点的功能。</li>\n<li>任务优先级：worker
线程数不足 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/task/datax.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/flink.html
b/zh-cn/docs/dev/user_doc/guide/task/flink.html
index 3d2dae563..29c4286b9 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/flink.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/flink.html
@@ -51,7 +51,7 @@
<h3>执行 WordCount 程序</h3>
<p>本案例为大数据生态中常见的入门案例，常应用于 MapReduce、Flink、Spark
等计算框架。主要为统计输入的文本中，相同的单词的数量有多少。（Flink 的 Releases 附带了此示例作业）</p>
<h4>在 DolphinScheduler 中配置 flink 环境</h4>
-<p>若生产环境中要是使用到 flink
任务类型，则需要先配置好所需的环境。配置文件如下：<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>。</p>
+<p>若生产环境中要是使用到 flink
任务类型，则需要先配置好所需的环境。配置文件如下：<code>bin/env/dolphinscheduler_env.sh</code>。</p>
<p><img src="/img/tasks/demo/flink_task01.png" alt="flink-configure"></p>
<h4>上传主程序包</h4>
<p>在使用 Flink 任务节点时，需要利用资源中心上传执行程序的 jar 包，可参考<a
href="../resource.md">资源中心</a>。</p>
diff --git a/zh-cn/docs/dev/user_doc/guide/task/flink.json
b/zh-cn/docs/dev/user_doc/guide/task/flink.json
index d445217ca..c2dc08fc4 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/flink.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/flink.json
@@ -1,6 +1,6 @@
{
"filename": "flink.md",
- "__html": "<h1>Flink节点</h1>\n<h2>综述</h2>\n<p>Flink 任务类型，用于执行 Flink 程序。对于
Flink 节点，worker 会通过使用 flink 命令 <code>flink run</code> 的方式提交任务。更多详情查看 <a
href=\"https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/deployment/cli/\";>flink
cli</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击“创建工作流”按钮，进入 DAG
编辑页面；</li>\n<li>拖动工具栏的 <img src=\"/img/tasks/icons/flink.png\" width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标
[...]
+ "__html": "<h1>Flink节点</h1>\n<h2>综述</h2>\n<p>Flink 任务类型，用于执行 Flink 程序。对于
Flink 节点，worker 会通过使用 flink 命令 <code>flink run</code> 的方式提交任务。更多详情查看 <a
href=\"https://nightlies.apache.org/flink/flink-docs-release-1.14/docs/deployment/cli/\";>flink
cli</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击“创建工作流”按钮，进入 DAG
编辑页面；</li>\n<li>拖动工具栏的 <img src=\"/img/tasks/icons/flink.png\" width=\"15\"/>
任务节点到画板中。</li>\n</ul>\n<h2>任务参数</h2>\n<ul>\n<li>节点名称：设置任务的名称。一个工作流定义中的节点名称是唯一的。</li>\n<li>运行标志：标
[...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/task/flink.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html
b/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html
index 2b1b62449..b460d15b1 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html
@@ -59,7 +59,7 @@
<h3>执行 WordCount 程序</h3>
<p>该样例为 MapReduce 应用中常见的入门类型，主要为统计输入的文本中，相同单词的数量有多少。</p>
<h4>在 DolphinScheduler 中配置 MapReduce 环境</h4>
-<p>若生产环境中要是使用到 MapReduce
任务类型，则需要先配置好所需的环境。配置文件如下：<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>。</p>
+<p>若生产环境中要是使用到 MapReduce
任务类型，则需要先配置好所需的环境。配置文件如下：<code>bin/env/dolphinscheduler_env.sh</code>。</p>
<p><img src="/img/tasks/demo/mr_task01.png" alt="mr_configure"></p>
<h4>上传主程序包</h4>
<p>在使用 MapReduce 任务节点时，需要利用资源中心上传执行程序的 jar 包。可参考<a
href="../resource.md">资源中心</a>。</p>
diff --git a/zh-cn/docs/dev/user_doc/guide/task/map-reduce.json
b/zh-cn/docs/dev/user_doc/guide/task/map-reduce.json
index 423dbac06..29c772c8f 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/map-reduce.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/map-reduce.json
@@ -1,6 +1,6 @@
{
"filename": "map-reduce.md",
- "__html": "<h1>MapReduce(MR) 节点</h1>\n<h2>综述</h2>\n<p>MapReduce(MR)
任务类型，用于执行 MapReduce 程序。对于 MapReduce 节点，worker 会通过使用 Hadoop 命令 <code>hadoop
jar</code> 的方式提交任务。更多详情查看 <a
href=\"https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CommandsManual.html#jar\";>Hadoop
Command
Manual</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入
DAG 编辑页面。</li>\n<li>拖动工具栏中的 <img src=\"/img/tasks/icons/mr.png\"
width=\"15\"/> 任务节点到画板中，如下图所示：</li>\n</ul>\n<h2 [...]
+ "__html": "<h1>MapReduce(MR) 节点</h1>\n<h2>综述</h2>\n<p>MapReduce(MR)
任务类型，用于执行 MapReduce 程序。对于 MapReduce 节点，worker 会通过使用 Hadoop 命令 <code>hadoop
jar</code> 的方式提交任务。更多详情查看 <a
href=\"https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CommandsManual.html#jar\";>Hadoop
Command
Manual</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入
DAG 编辑页面。</li>\n<li>拖动工具栏中的 <img src=\"/img/tasks/icons/mr.png\"
width=\"15\"/> 任务节点到画板中，如下图所示：</li>\n</ul>\n<h2 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/task/map-reduce.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/spark.html
b/zh-cn/docs/dev/user_doc/guide/task/spark.html
index 3c031e91f..92a5539ff 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/spark.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/spark.html
@@ -54,7 +54,7 @@
<h3>执行 WordCount 程序</h3>
<p>本案例为大数据生态中常见的入门案例，常应用于 MapReduce、Flink、Spark
等计算框架。主要为统计输入的文本中，相同的单词的数量有多少。</p>
<h4>在 DolphinScheduler 中配置 Spark 环境</h4>
-<p>若生产环境中要是使用到 Spark
任务类型，则需要先配置好所需的环境。配置文件如下：<code>/dolphinscheduler/conf/env/dolphinscheduler_env.sh</code>。</p>
+<p>若生产环境中要是使用到 Spark
任务类型，则需要先配置好所需的环境。配置文件如下：<code>bin/env/dolphinscheduler_env.sh</code>。</p>
<p><img src="/img/tasks/demo/spark_task01.png" alt="spark_configure"></p>
<h4>上传主程序包</h4>
<p>在使用 Spark 任务节点时，需要利用资源中心上传执行程序的 jar 包，可参考<a
href="../resource.md">资源中心</a>。</p>
diff --git a/zh-cn/docs/dev/user_doc/guide/task/spark.json
b/zh-cn/docs/dev/user_doc/guide/task/spark.json
index 1cc253203..5a1fe0ca3 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/spark.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/spark.json
@@ -1,6 +1,6 @@
{
"filename": "spark.md",
- "__html": "<h1>SPARK节点</h1>\n<h2>综述</h2>\n<p>Spark 任务类型，用于执行 Spark 程序。对于
Spark 节点，worker 会通过使用 spark 命令 <code>spark submit</code> 方式提交任务。更多详情查看 <a
href=\"https://spark.apache.org/docs/3.2.1/submitting-applications.html#launching-applications-with-spark-submit\";>spark-submit</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>\n<p>点击项目管理
-> 项目名称 -> 工作流定义，点击”创建工作流”按钮，进入 DAG 编辑页面：</p>\n</li>\n<li>\n<p>拖动工具栏的
<img src=\"/img/tasks/icons/spark.png\" width=\"15\"/>
任务节点到画板中。</p>\n</li>\n</ul>\n<h2>任务参 [...]
+ "__html": "<h1>SPARK节点</h1>\n<h2>综述</h2>\n<p>Spark 任务类型，用于执行 Spark 程序。对于
Spark 节点，worker 会通过使用 spark 命令 <code>spark submit</code> 方式提交任务。更多详情查看 <a
href=\"https://spark.apache.org/docs/3.2.1/submitting-applications.html#launching-applications-with-spark-submit\";>spark-submit</a>。</p>\n<h2>创建任务</h2>\n<ul>\n<li>\n<p>点击项目管理
-> 项目名称 -> 工作流定义，点击”创建工作流”按钮，进入 DAG 编辑页面：</p>\n</li>\n<li>\n<p>拖动工具栏的
<img src=\"/img/tasks/icons/spark.png\" width=\"15\"/>
任务节点到画板中。</p>\n</li>\n</ul>\n<h2>任务参 [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/task/spark.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/upgrade.html
b/zh-cn/docs/dev/user_doc/guide/upgrade.html
index 0788f1e8a..72dc5fe2c 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.html
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.html
@@ -25,7 +25,7 @@
<p>将<code>./tools/conf/application.yaml</code>中的username和password改成你设定数据库用户名和密码</p>
</li>
<li>
-<p>如果选择 MySQL，请修改<code>./tools/bin/dolphinscheduler_env.sh</code>中的如下配置,
还需要手动添加 [<a href="https://downloads.MySQL.com/archives/c-j/";>
mysql-connector-java 驱动 jar </a>] 包到 lib
目录（<code>./tools/lib</code>）下，这里下载的是mysql-connector-java-8.0.16.jar</p>
+<p>如果选择 MySQL，请修改<code>./tools/bin/dolphinscheduler_env.sh</code>中的如下配置,
还需要手动添加 <a href="https://downloads.MySQL.com/archives/c-j/";>
mysql-connector-java 驱动 jar </a> 包到 lib
目录（<code>./tools/lib</code>）下，这里下载的是mysql-connector-java-8.0.16.jar</p>
<pre><code class="language-shell">export DATABASE=${DATABASE:-mysql}
</code></pre>
</li>
diff --git a/zh-cn/docs/dev/user_doc/guide/upgrade.json
b/zh-cn/docs/dev/user_doc/guide/upgrade.json
index 205ea96f3..5ef025065 100644
--- a/zh-cn/docs/dev/user_doc/guide/upgrade.json
+++ b/zh-cn/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler升级文档</h1>\n<h2>1. 备份上一版本文件和数据库</h2>\n<h2>2.
停止dolphinscheduler所有服务</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>3. 下载新版本的安装包</h2>\n<ul>\n<li><a
href=\"/zh-cn/download/download.html\">下载</a>,
下载最新版本的二进制安装包</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4.
数据库升级</h2>\n<ul>\n<li>\n<p>将<code>./tools/conf/application.yaml</code>中的username和password改成你设定数据库用户名和密码</p>\n</li>\n<li>\n<p>如果选择
MySQL，请修改<code>./tools/bin/dolphinscheduler_env.sh</code>中的如下配置, [...]
+ "__html": "<h1>DolphinScheduler升级文档</h1>\n<h2>1. 备份上一版本文件和数据库</h2>\n<h2>2.
停止dolphinscheduler所有服务</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>3. 下载新版本的安装包</h2>\n<ul>\n<li><a
href=\"/zh-cn/download/download.html\">下载</a>,
下载最新版本的二进制安装包</li>\n<li>以下升级操作都需要在新版本的目录进行</li>\n</ul>\n<h2>4.
数据库升级</h2>\n<ul>\n<li>\n<p>将<code>./tools/conf/application.yaml</code>中的username和password改成你设定数据库用户名和密码</p>\n</li>\n<li>\n<p>如果选择
MySQL，请修改<code>./tools/bin/dolphinscheduler_env.sh</code>中的如下配置, [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/upgrade.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/release/faq.html b/zh-cn/docs/release/faq.html
index b541f80c3..06f23122e 100644
--- a/zh-cn/docs/release/faq.html
+++ b/zh-cn/docs/release/faq.html
@@ -145,7 +145,7 @@
<p> 3，流程定义 <strong>查看或编辑</strong> DAG 页面，任意 <strong>任务节点右击</strong>
启动流程定义</p>
<p> 4，可以对流程定义 DAG 编辑，设置某些任务的运行标志位
<strong>禁止运行</strong>，则在启动流程定义的时候，将该节点的连线将从 DAG 中去掉</p>
<h2>Q：Python 任务设置 Python 版本</h2>
-<p>A： 只需要修改 conf/env/dolphinscheduler_env.sh 中的 PYTHON_HOME</p>
+<p>A： 只需要修改 <code>bin/env/dolphinscheduler_env.sh</code> 中的 PYTHON_HOME</p>
<pre><code>export PYTHON_HOME=/bin/python
</code></pre>
<p>注意：这了 <strong>PYTHON_HOME</strong> ，是 python 命令的绝对路径，而不是单纯的
PYTHON_HOME，还需要注意的是 export PATH 的时候，需要直接</p>
diff --git a/zh-cn/docs/release/faq.json b/zh-cn/docs/release/faq.json
index 6b6191e7c..254f6e894 100644
--- a/zh-cn/docs/release/faq.json
+++ b/zh-cn/docs/release/faq.json
@@ -1,6 +1,6 @@
{
"filename": "faq.md",
- "__html": "<!-- markdown-link-check-disable
-->\n<h2>Q：项目的名称是？</h2>\n<p>A：DolphinScheduler</p>\n<hr>\n<h2>Q：DolphinScheduler
服务介绍及建议运行内存</h2>\n<p>A：DolphinScheduler 由 5
个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer 和
UI。</p>\n<table>\n<thead>\n<tr>\n<th>服务</th>\n<th>说明</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>主要负责
<strong>DAG</strong>
的切分和任务状态的监控</td>\n</tr>\n<tr>\n<td>WorkerServer/LoggerServer</td>\n<td>主要负责任务的提交、执行和任务状态的更新。LoggerServer
用于 [...]
+ "__html": "<!-- markdown-link-check-disable
-->\n<h2>Q：项目的名称是？</h2>\n<p>A：DolphinScheduler</p>\n<hr>\n<h2>Q：DolphinScheduler
服务介绍及建议运行内存</h2>\n<p>A：DolphinScheduler 由 5
个服务组成，MasterServer、WorkerServer、ApiServer、AlertServer、LoggerServer 和
UI。</p>\n<table>\n<thead>\n<tr>\n<th>服务</th>\n<th>说明</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>MasterServer</td>\n<td>主要负责
<strong>DAG</strong>
的切分和任务状态的监控</td>\n</tr>\n<tr>\n<td>WorkerServer/LoggerServer</td>\n<td>主要负责任务的提交、执行和任务状态的更新。LoggerServer
用于 [...]
"link": "/dist/zh-cn/docs/release/faq.html",
"meta": {}
}
\ No newline at end of file
