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 7a42d402e Automated deployment:
e856cf0cf4d531cd5ebc57df588126d94ae905cf
7a42d402e is described below
commit 7a42d402e4765a5639015e1230f9a4705762c588
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 8 05:05:35 2022 +0000
Automated deployment: e856cf0cf4d531cd5ebc57df588126d94ae905cf
---
.../guide/installation/pseudo-cluster.html | 4 ++-
.../guide/installation/pseudo-cluster.json | 2 +-
.../user_doc/guide/installation/standalone.html | 5 ++++
.../user_doc/guide/installation/standalone.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/dev/user_doc/guide/upgrade.html | 2 +-
en-us/docs/dev/user_doc/guide/upgrade.json | 2 +-
en-us/docs/release/faq.html | 10 +++----
en-us/docs/release/faq.json | 2 +-
python/_sources/start.rst.txt | 28 +++++++++++--------
python/_sources/tutorial.rst.txt | 2 +-
python/index.html | 2 +-
python/objects.inv | Bin 5192 -> 5194 bytes
python/searchindex.js | 2 +-
python/start.html | 30 ++++++++++++---------
python/tutorial.html | 2 +-
zh-cn/docs/release/faq.html | 7 -----
zh-cn/docs/release/faq.json | 2 +-
19 files changed, 59 insertions(+), 49 deletions(-)
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 03aa8cec6..b87624395 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
@@ -176,7 +176,9 @@ 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</p>
+<p><strong><em>Note:</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>
</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>
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 c8e1441e3..9397e0ece 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 8404cfd15..6bea55269 100644
--- a/en-us/docs/dev/user_doc/guide/installation/standalone.html
+++ b/en-us/docs/dev/user_doc/guide/installation/standalone.html
@@ -38,6 +38,11 @@ sh ./bin/dolphinscheduler-daemon.sh start standalone-server
<span class="hljs-meta">#</span><span class="bash"> Stop Standalone
Server</span>
sh ./bin/dolphinscheduler-daemon.sh stop standalone-server
</code></pre>
+<blockquote>
+<p>Note: 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>
</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 5b896e507..020443438 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/spark.html
b/en-us/docs/dev/user_doc/guide/task/spark.html
index 45a1bfff3..5e29ff66d 100644
--- a/en-us/docs/dev/user_doc/guide/task/spark.html
+++ b/en-us/docs/dev/user_doc/guide/task/spark.html
@@ -60,7 +60,7 @@
<p>Configure the required content according to the parameter descriptions
above.</p>
<p><img src="/img/tasks/demo/spark_task02.png" alt="demo-spark-simple"></p>
<h2>Notice</h2>
-<p>JAVA and Scala only used for identification, there is no difference. If use
Python to develop Flink, there is no class of the main function and the rest is
the same.</p>
+<p>JAVA and Scala only used for identification, there is no difference. If you
use Python to develop Spark application, there is no class of the main function
and the rest is the same.</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/task/spark.json
b/en-us/docs/dev/user_doc/guide/task/spark.json
index 8de735fe9..fb4d71adb 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/dev/user_doc/guide/upgrade.html
b/en-us/docs/dev/user_doc/guide/upgrade.html
index d6f899fd6..adbc1710b 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.html
+++ b/en-us/docs/dev/user_doc/guide/upgrade.html
@@ -14,7 +14,7 @@
<h2>Back-Up Previous Version's Files and Database</h2>
<h2>Stop All Services of DolphinScheduler</h2>
<p><code>sh ./script/stop-all.sh</code></p>
-<h2>Download the Newest Version Installation Package</h2>
+<h2>Download the Latest Version Installation Package</h2>
<ul>
<li><a href="/en-us/download/download.html">download</a> the latest version of
the installation packages.</li>
<li>The following upgrade operations need to be performed in the new version's
directory.</li>
diff --git a/en-us/docs/dev/user_doc/guide/upgrade.json
b/en-us/docs/dev/user_doc/guide/upgrade.json
index e5ae157d3..37e50aaf6 100644
--- a/en-us/docs/dev/user_doc/guide/upgrade.json
+++ b/en-us/docs/dev/user_doc/guide/upgrade.json
@@ -1,6 +1,6 @@
{
"filename": "upgrade.md",
- "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back-Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the Newest Version Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\ [...]
+ "__html": "<h1>DolphinScheduler Upgrade Documentation</h1>\n<h2>Back-Up
Previous Version's Files and Database</h2>\n<h2>Stop All Services of
DolphinScheduler</h2>\n<p><code>sh
./script/stop-all.sh</code></p>\n<h2>Download the Latest Version Installation
Package</h2>\n<ul>\n<li><a href=\"/en-us/download/download.html\">download</a>
the latest version of the installation packages.</li>\n<li>The following
upgrade operations need to be performed in the new version's
directory.</li>\n</ul>\ [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/upgrade.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 efe93ce7d..3de8b366e 100644
--- a/en-us/docs/release/faq.html
+++ b/en-us/docs/release/faq.html
@@ -374,12 +374,6 @@ A: 1, Edit ngnix config file, edit upload max size
client_max_body_size 1024m.
proxy_send_timeout 300s;
</code></pre>
<hr>
-<h2>Q : Welcome to subscribe the DolphinScheduler development mailing list</h2>
-<p>A: In the process of using DolphinScheduler, if you have any questions or
ideas, suggestions, you can participate in the DolphinScheduler community
building through the Apache mailing list. Sending a subscription email is also
very simple, the steps are as follows:</p>
-<p>1, Send an email to <a
href="mailto:[email protected]";>[email protected]</a>
with your own email address, subject and content.</p>
-<p>2, Receive confirmation email and reply. After completing step 1, you will
receive a confirmation email from <a
href="mailto:[email protected]";>[email protected]</a>
(if not received, please confirm whether the email is automatically classified
as spam, promotion email, subscription email, etc.) . Then reply directly to
the email, or click on the link in the email to reply quickly, the subject and
content are arbitrary.</p>
-<p>3, Receive a welcome email. After completing the above steps, you will
receive a welcome email with the subject WELCOME to <a
href="mailto:[email protected]";>[email protected]</a>,
and you have successfully subscribed to the Apache DolphinScheduler mailing
list.</p>
-<hr>
<h2>Q : Workflow Dependency</h2>
<p>A: 1, It is currently judged according to natural days, at the end of last
month: the judgment time is the workflow A start_time/scheduler_time between
'2019-05-31 00:00:00' and '2019-05-31 23:59:59'. Last month: It is judged that
there is an A instance completed every day from the 1st to the end of the
month. Last week: There are completed A instances 7 days last week. The first
two days: Judging yesterday and the day before yesterday, there must be a
completed A instance for two days.</p>
<hr>
@@ -513,6 +507,10 @@ sed -i 's/Defaults requirett/#Defaults
requirett/g' /etc/sudoers
<p>A：The repair can be completed by executing the following SQL in the
database:</p>
<pre><code class="language-SQL">update t_ds_version <span
class="hljs-keyword">set</span> version<span
class="hljs-operator">=</span><span
class="hljs-string">'2.0.1'</span>;
</code></pre>
+<h2>Can not find python-gateway-server in distribute package</h2>
+<p>After version 3.0.0-alpha, Python gateway server integrate into API server,
and Python gateway service will start when you
+start API server. If you want disabled when Python gateway service you could
change API server configuration in path
+<code>api-server/conf/application.yaml</code> and change attribute
<code>python-gateway.enabled : false</code>.</p>
<hr>
<h2>We will collect more FAQ later</h2>
</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 [...]
diff --git a/en-us/docs/release/faq.json b/en-us/docs/release/faq.json
index 3cc096e2b..bbbd41557 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/python/_sources/start.rst.txt b/python/_sources/start.rst.txt
index 0af90d549..489f4e8eb 100644
--- a/python/_sources/start.rst.txt
+++ b/python/_sources/start.rst.txt
@@ -55,7 +55,7 @@ After Python is already installed on your machine following
section
$ pip install apache-dolphinscheduler
The latest version of *PyDolphinScheduler* would be installed after you run
above
-command in your terminal. You could go and `start Python Gateway Server`_ to
finish
+command in your terminal. You could go and `start Python Gateway Service`_ to
finish
the prepare, and then go to :doc:`tutorial` to make your hand dirty. But if you
want to install the unreleased version of *PyDolphinScheduler*, you could go
and see
section `installing PyDolphinScheduler in dev`_ for more detail.
@@ -74,33 +74,39 @@ which we hold in GitHub
# Install PyDolphinScheduler in develop mode
$ cd dolphinscheduler-python/pydolphinscheduler && pip install -e .
-After you installed *PyDolphinScheduler*, please remember `start Python
Gateway Server`_
+After you installed *PyDolphinScheduler*, please remember `start Python
Gateway Service`_
which waiting for *PyDolphinScheduler*'s workflow definition require.
-Start Python Gateway Server
----------------------------
+Start Python Gateway Service
+----------------------------
Since **PyDolphinScheduler** is Python API for `Apache DolphinScheduler`_, it
could define workflow and tasks structure, but could not run it unless you
-`install Apache DolphinScheduler`_ and start Python gateway server. We only
-and some key steps here and you could go `install Apache DolphinScheduler`_
-for more detail
+`install Apache DolphinScheduler`_ and start its API server which including
+Python gateway service in it. We only and some key steps here and you could
+go `install Apache DolphinScheduler`_ for more detail
.. code-block:: bash
- # Start pythonGatewayServer
- $ ./bin/dolphinscheduler-daemon.sh start pythonGatewayServer
+ # Start DolphinScheduler api-server which including python gateway service
+ $ ./bin/dolphinscheduler-daemon.sh start api-server
To check whether the server is alive or not, you could run :code:`jps`. And
-the server is health if keyword `PythonGatewayServer` in the console.
+the server is health if keyword `ApiApplicationServer` in the console.
.. code-block:: bash
$ jps
....
- 201472 PythonGatewayServer
+ 201472 ApiApplicationServer
....
+.. note::
+
+ Please make sure you already enabled started Python gateway service along
with `api-server`. The configuration is in
+ yaml config path `python-gateway.enabled : true` in api-server's
configuration path in `api-server/conf/application.yaml`.
+ The default value is true and Python gateway service start when api server
is been started.
+
What's More
-----------
diff --git a/python/_sources/tutorial.rst.txt b/python/_sources/tutorial.rst.txt
index 83c5746ab..e0f22fb81 100644
--- a/python/_sources/tutorial.rst.txt
+++ b/python/_sources/tutorial.rst.txt
@@ -130,7 +130,7 @@ Now, we could run the Python code like other Python script,
for the basic usage
:end-before: [end submit_or_run]
If you not start your Apache DolphinScheduler server, you could find the way in
-:ref:`start:start Python gateway server` and it would have more detail about
related server
+:ref:`start:start Python gateway service` and it would have more detail about
related server
start. Beside attribute `run`, we have attribute `submit` for object
`ProcessDefinition`
and it just submit workflow to the daemon but not setting the schedule
information. For
more detail you could see :ref:`concept:process definition`.
diff --git a/python/index.html b/python/index.html
index 7b5a8e9d9..0236e5944 100644
--- a/python/index.html
+++ b/python/index.html
@@ -81,7 +81,7 @@ then go and see <a class="reference internal"
href="tutorial.html"><span class="
<li class="toctree-l2"><a class="reference internal"
href="start.html#installing-python">Installing Python</a></li>
<li class="toctree-l2"><a class="reference internal"
href="start.html#installing-pydolphinscheduler">Installing
PyDolphinScheduler</a></li>
<li class="toctree-l2"><a class="reference internal"
href="start.html#installing-pydolphinscheduler-in-dev">Installing
PyDolphinScheduler In Dev</a></li>
-<li class="toctree-l2"><a class="reference internal"
href="start.html#start-python-gateway-server">Start Python Gateway
Server</a></li>
+<li class="toctree-l2"><a class="reference internal"
href="start.html#start-python-gateway-service">Start Python Gateway
Service</a></li>
<li class="toctree-l2"><a class="reference internal"
href="start.html#what-s-more">What’s More</a></li>
</ul>
</li>
diff --git a/python/objects.inv b/python/objects.inv
index 59b336ff1..ab70ce4b0 100644
Binary files a/python/objects.inv and b/python/objects.inv differ
diff --git a/python/searchindex.js b/python/searchindex.js
index 76b36f6bb..f90fe37b0 100644
--- a/python/searchindex.js
+++ b/python/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["api","cli","concept","index","start","tasks/condition","tasks/datax","tasks/dependent","tasks/flink","tasks/http","tasks/index","tasks/map_reduce","tasks/procedure","tasks/python","tasks/shell","tasks/spark","tasks/sql","tasks/sub_process","tasks/switch","tutorial"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":5,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphi
[...]
\ No newline at end of file
+Search.setIndex({docnames:["api","cli","concept","index","start","tasks/condition","tasks/datax","tasks/dependent","tasks/flink","tasks/http","tasks/index","tasks/map_reduce","tasks/procedure","tasks/python","tasks/shell","tasks/spark","tasks/sql","tasks/sub_process","tasks/switch","tutorial"],envversion:{"sphinx.domains.c":2,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":5,"sphinx.domains.index":1,"sphinx.domains.javascript":2,"sphinx.domains.math":2,"sphi
[...]
\ No newline at end of file
diff --git a/python/start.html b/python/start.html
index 84069188c..a2442c77b 100644
--- a/python/start.html
+++ b/python/start.html
@@ -42,7 +42,7 @@
<li class="toctree-l2"><a class="reference internal"
href="#installing-python">Installing Python</a></li>
<li class="toctree-l2"><a class="reference internal"
href="#installing-pydolphinscheduler">Installing PyDolphinScheduler</a></li>
<li class="toctree-l2"><a class="reference internal"
href="#installing-pydolphinscheduler-in-dev">Installing PyDolphinScheduler In
Dev</a></li>
-<li class="toctree-l2"><a class="reference internal"
href="#start-python-gateway-server">Start Python Gateway Server</a></li>
+<li class="toctree-l2"><a class="reference internal"
href="#start-python-gateway-service">Start Python Gateway Service</a></li>
<li class="toctree-l2"><a class="reference internal"
href="#what-s-more">What’s More</a></li>
</ul>
</li>
@@ -109,7 +109,7 @@ Python <span class="m">3</span>.8.7
</pre></div>
</div>
<p>The latest version of <em>PyDolphinScheduler</em> would be installed after
you run above
-command in your terminal. You could go and <a class="reference internal"
href="#start-python-gateway-server">start Python Gateway Server</a> to finish
+command in your terminal. You could go and <a class="reference internal"
href="#start-python-gateway-service">start Python Gateway Service</a> to finish
the prepare, and then go to <a class="reference internal"
href="tutorial.html"><span class="doc">Tutorial</span></a> to make your hand
dirty. But if you
want to install the unreleased version of <em>PyDolphinScheduler</em>, you
could go and see
section <a class="reference internal"
href="#installing-pydolphinscheduler-in-dev">installing PyDolphinScheduler in
dev</a> for more detail.</p>
@@ -125,28 +125,34 @@ $ git clone [email protected]:apache/dolphinscheduler.git
$ <span class="nb">cd</span> dolphinscheduler-python/pydolphinscheduler <span
class="o">&&</span> pip install -e .
</pre></div>
</div>
-<p>After you installed <em>PyDolphinScheduler</em>, please remember <a
class="reference internal" href="#start-python-gateway-server">start Python
Gateway Server</a>
+<p>After you installed <em>PyDolphinScheduler</em>, please remember <a
class="reference internal" href="#start-python-gateway-service">start Python
Gateway Service</a>
which waiting for <em>PyDolphinScheduler</em>’s workflow definition
require.</p>
</section>
-<section id="start-python-gateway-server">
-<h2>Start Python Gateway Server<a class="headerlink"
href="#start-python-gateway-server" title="Permalink to this
headline"></a></h2>
+<section id="start-python-gateway-service">
+<h2>Start Python Gateway Service<a class="headerlink"
href="#start-python-gateway-service" title="Permalink to this
headline"></a></h2>
<p>Since <strong>PyDolphinScheduler</strong> is Python API for <a
class="reference external" href="https://dolphinscheduler.apache.org";>Apache
DolphinScheduler</a>, it
could define workflow and tasks structure, but could not run it unless you
-<a class="reference external"
href="https://dolphinscheduler.apache.org/en-us/docs/latest/user_doc/guide/installation/standalone.html";>install
Apache DolphinScheduler</a> and start Python gateway server. We only
-and some key steps here and you could go <a class="reference external"
href="https://dolphinscheduler.apache.org/en-us/docs/latest/user_doc/guide/installation/standalone.html";>install
Apache DolphinScheduler</a>
-for more detail</p>
-<div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span><span class="c1"># Start
pythonGatewayServer</span>
-$ ./bin/dolphinscheduler-daemon.sh start pythonGatewayServer
+<a class="reference external"
href="https://dolphinscheduler.apache.org/en-us/docs/latest/user_doc/guide/installation/standalone.html";>install
Apache DolphinScheduler</a> and start its API server which including
+Python gateway service in it. We only and some key steps here and you could
+go <a class="reference external"
href="https://dolphinscheduler.apache.org/en-us/docs/latest/user_doc/guide/installation/standalone.html";>install
Apache DolphinScheduler</a> for more detail</p>
+<div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span><span class="c1"># Start DolphinScheduler
api-server which including python gateway service</span>
+$ ./bin/dolphinscheduler-daemon.sh start api-server
</pre></div>
</div>
<p>To check whether the server is alive or not, you could run <code
class="code docutils literal notranslate"><span class="pre">jps</span></code>.
And
-the server is health if keyword <cite>PythonGatewayServer</cite> in the
console.</p>
+the server is health if keyword <cite>ApiApplicationServer</cite> in the
console.</p>
<div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ jps
....
-<span class="m">201472</span> PythonGatewayServer
+<span class="m">201472</span> ApiApplicationServer
....
</pre></div>
</div>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>Please make sure you already enabled started Python gateway service along
with <cite>api-server</cite>. The configuration is in
+yaml config path <cite>python-gateway.enabled : true</cite> in api-server’s
configuration path in <cite>api-server/conf/application.yaml</cite>.
+The default value is true and Python gateway service start when api server is
been started.</p>
+</div>
</section>
<section id="what-s-more">
<h2>What’s More<a class="headerlink" href="#what-s-more" title="Permalink to
this headline"></a></h2>
diff --git a/python/tutorial.html b/python/tutorial.html
index 6ad0b2895..0ee6ce82c 100644
--- a/python/tutorial.html
+++ b/python/tutorial.html
@@ -218,7 +218,7 @@ to the daemon, and set the schedule time we just declare in
<a class="reference
</pre></div>
</div>
<p>If you not start your Apache DolphinScheduler server, you could find the
way in
-<a class="reference internal"
href="start.html#start-python-gateway-server"><span class="std std-ref">Start
Python Gateway Server</span></a> and it would have more detail about related
server
+<a class="reference internal"
href="start.html#start-python-gateway-service"><span class="std std-ref">Start
Python Gateway Service</span></a> and it would have more detail about related
server
start. Beside attribute <cite>run</cite>, we have attribute
<cite>submit</cite> for object <cite>ProcessDefinition</cite>
and it just submit workflow to the daemon but not setting the schedule
information. For
more detail you could see <a class="reference internal"
href="concept.html#process-definition"><span class="std std-ref">Process
Definition</span></a>.</p>
diff --git a/zh-cn/docs/release/faq.html b/zh-cn/docs/release/faq.html
index e49414aa2..64bf77b64 100644
--- a/zh-cn/docs/release/faq.html
+++ b/zh-cn/docs/release/faq.html
@@ -358,13 +358,6 @@ A：1，编辑 ngnix 配置文件 vi /etc/nginx/nginx.conf，更改上传大小
proxy_send_timeout 300s;
</code></pre>
<hr>
-<h2>Q：欢迎订阅 DolphinScheduler 开发邮件列表</h2>
-<p>A：在使用 DolphinScheduler 的过程中，如果您有任何问题或者想法、建议，都可以通过 Apache 邮件列表参与到
DolphinScheduler 的社区建设中来。
-发送订阅邮件也非常简单，步骤如下:</p>
-<p>1，用自己的邮箱向 <a
href="mailto:[email protected]";>[email protected]</a>
发送一封邮件，主题和内容任意。</p>
-<p>2， 接收确认邮件并回复。 完成步骤1后，您将收到一封来自 <a
href="mailto:[email protected]";>[email protected]</a>
的确认邮件（如未收到，请确认邮件是否被自动归入垃圾邮件、推广邮件、订阅邮件等文件夹）。然后直接回复该邮件，或点击邮件里的链接快捷回复即可，主题和内容任意。</p>
-<p>3， 接收欢迎邮件。 完成以上步骤后，您会收到一封主题为 WELCOME to <a
href="mailto:[email protected]";>[email protected]</a>
的欢迎邮件，至此您已成功订阅 Apache DolphinScheduler的邮件列表。</p>
-<hr>
<h2>Q：工作流依赖</h2>
<p>A：1，目前是按照自然天来判断，上月末：判断时间是工作流 A start_time/scheduler_time between
'2019-05-31 00:00:00' and '2019-05-31 23:59:59'。上月：是判断上个月从 1
号到月末每天都要有完成的A实例。上周： 上周 7 天都要有完成的 A 实例。前两天： 判断昨天和前天，两天都要有完成的 A 实例。</p>
<hr>
diff --git a/zh-cn/docs/release/faq.json b/zh-cn/docs/release/faq.json
index d4cf51f90..6b6191e7c 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
