You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by gi...@apache.org on 2022/06/02 05:15:52 UTC
[dolphinscheduler-website] branch asf-site updated: Automated deployment: 0f421125b2fca94615c5755fb5bf30c82f77751f
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 ae6cc8acc Automated deployment: 0f421125b2fca94615c5755fb5bf30c82f77751f
ae6cc8acc is described below
commit ae6cc8acc45ea7985d9ec7002eb3a2851f3aa3be
Author: github-actions[bot] <gi...@users.noreply.github.com>
AuthorDate: Thu Jun 2 05:15:47 2022 +0000
Automated deployment: 0f421125b2fca94615c5755fb5bf30c82f77751f
---
en-us/docs/dev/user_doc/guide/resource/file-manage.html | 8 +++++++-
en-us/docs/dev/user_doc/guide/resource/file-manage.json | 2 +-
en-us/docs/dev/user_doc/guide/task/shell.html | 1 +
en-us/docs/dev/user_doc/guide/task/shell.json | 2 +-
zh-cn/docs/dev/user_doc/guide/resource/file-manage.html | 6 ++++++
zh-cn/docs/dev/user_doc/guide/resource/file-manage.json | 2 +-
zh-cn/docs/dev/user_doc/guide/task/shell.html | 14 +++++++-------
zh-cn/docs/dev/user_doc/guide/task/shell.json | 2 +-
8 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/en-us/docs/dev/user_doc/guide/resource/file-manage.html b/en-us/docs/dev/user_doc/guide/resource/file-manage.html
index a090811f5..12e6deb00 100644
--- a/en-us/docs/dev/user_doc/guide/resource/file-manage.html
+++ b/en-us/docs/dev/user_doc/guide/resource/file-manage.html
@@ -13,7 +13,13 @@
<div id="root"><div class="md2html docs-page" data-reactroot=""><header class="header-container header-container-dark"><div class="banner-tips"><div>🤔 Have queries regarding Apache DolphinScheduler, Join Slack channel to disscuss them <a class="link-tips" href="https://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw">join #dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn mobile-menu-btn-dark"></span> [...]
<p>When third party jars are used in the scheduling process or user defined scripts are required, these can be created from this page. The types of files that can be created include: txt, log, sh, conf, py, java and so on. Files can be edited, renamed, downloaded and deleted.</p>
<p><img src="/img/new_ui/dev/resource/file-manage.png" alt="file-manage"></p>
-<h2>Basic Operator</h2>
+<blockquote>
+<p><strong><em>Note:</em></strong></p>
+<ul>
+<li>When you manage files as <code>admin</code>, remember to set up <code>tenant</code> for <code>admin</code> first.</li>
+</ul>
+</blockquote>
+<h2>Basic Operations</h2>
<h3>Create a File</h3>
<p>The file format supports the following types: txt, log, sh, conf, cfg, py, java, sql, xml, hql, properties.</p>
<p><img src="/img/new_ui/dev/resource/create-file.png" alt="create-file"></p>
diff --git a/en-us/docs/dev/user_doc/guide/resource/file-manage.json b/en-us/docs/dev/user_doc/guide/resource/file-manage.json
index 7241bc278..665b728e1 100644
--- a/en-us/docs/dev/user_doc/guide/resource/file-manage.json
+++ b/en-us/docs/dev/user_doc/guide/resource/file-manage.json
@@ -1,6 +1,6 @@
{
"filename": "file-manage.md",
- "__html": "<h1>File Management</h1>\n<p>When third party jars are used in the scheduling process or user defined scripts are required, these can be created from this page. The types of files that can be created include: txt, log, sh, conf, py, java and so on. Files can be edited, renamed, downloaded and deleted.</p>\n<p><img src=\"/img/new_ui/dev/resource/file-manage.png\" alt=\"file-manage\"></p>\n<h2>Basic Operator</h2>\n<h3>Create a File</h3>\n<p>The file format supports the followi [...]
+ "__html": "<h1>File Management</h1>\n<p>When third party jars are used in the scheduling process or user defined scripts are required, these can be created from this page. The types of files that can be created include: txt, log, sh, conf, py, java and so on. Files can be edited, renamed, downloaded and deleted.</p>\n<p><img src=\"/img/new_ui/dev/resource/file-manage.png\" alt=\"file-manage\"></p>\n<blockquote>\n<p><strong><em>Note:</em></strong></p>\n<ul>\n<li>When you manage files as [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/resource/file-manage.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/task/shell.html b/en-us/docs/dev/user_doc/guide/task/shell.html
index 4fc0c8c21..7ab0ddd3d 100644
--- a/en-us/docs/dev/user_doc/guide/task/shell.html
+++ b/en-us/docs/dev/user_doc/guide/task/shell.html
@@ -48,6 +48,7 @@ After running this example, we would see "param_val" print in the log.
<p>The shell task type resolves whether the task log contains <code>application_xxx_xxx</code> to determine whether is the yarn task. If so, the corresponding application
will be use to judge the running state of the current shell node. At this time, if stops the operation of the workflow, the corresponding <code>application_id</code>
will be killed.</p>
+<p>If you want to use resource files in Shell tasks, you can upload corresponding files through the resource center and then use the resources in the Shell task. Reference: <a href="../resource/file-manage.md">file-manage</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="/asset/js/react/react-with-addons.min.js"></script>
<script src="/asset/js/react/react-dom.min.js"></script>
diff --git a/en-us/docs/dev/user_doc/guide/task/shell.json b/en-us/docs/dev/user_doc/guide/task/shell.json
index 8bacece7d..5a8164e20 100644
--- a/en-us/docs/dev/user_doc/guide/task/shell.json
+++ b/en-us/docs/dev/user_doc/guide/task/shell.json
@@ -1,6 +1,6 @@
{
"filename": "shell.md",
- "__html": "<h1>Shell</h1>\n<h2>Overview</h2>\n<p>Shell task used to create a shell task type and execute a series of shell scripts. When the worker run the shell task, a temporary shell script is generated, and use the Linux user with the same name as the tenant executes the script.</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> [...]
+ "__html": "<h1>Shell</h1>\n<h2>Overview</h2>\n<p>Shell task used to create a shell task type and execute a series of shell scripts. When the worker run the shell task, a temporary shell script is generated, and use the Linux user with the same name as the tenant executes the script.</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> [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/task/shell.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html b/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html
index 644bcbacb..954a15c3e 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html
+++ b/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html
@@ -12,6 +12,12 @@
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header class="header-container header-container-dark"><div class="banner-tips"><div>🤔 有关于 Apache DolphinScheduler 的疑问，加入 Slack 频道来讨论他们 <a class="link-tips" href="https://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw">join #dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn mobile-menu-btn-dark"></span><a href="/zh-cn/index.html"><img cl [...]
<p>当在调度过程中需要使用到第三方的 jar 或者用户需要自定义脚本的情况，可以通过在该页面完成相关操作。可创建的文件类型包括：<code>txt/log/sh/conf/py/java</code> 等。并且可以对文件进行编辑、重命名、下载和删除等操作。</p>
+<blockquote>
+<p><strong><em>注意：</em></strong></p>
+<ul>
+<li>当您以<code>admin</code>身份等入并操作文件时，需要先给<code>admin</code>设置租户</li>
+</ul>
+</blockquote>
<h2>基础操作</h2>
<p><img src="/img/new_ui/dev/resource/file-manage.png" alt="file-manage"></p>
<h3>创建文件</h3>
diff --git a/zh-cn/docs/dev/user_doc/guide/resource/file-manage.json b/zh-cn/docs/dev/user_doc/guide/resource/file-manage.json
index 3dae6f08e..f5d266166 100644
--- a/zh-cn/docs/dev/user_doc/guide/resource/file-manage.json
+++ b/zh-cn/docs/dev/user_doc/guide/resource/file-manage.json
@@ -1,6 +1,6 @@
{
"filename": "file-manage.md",
- "__html": "<h1>文件管理</h1>\n<p>当在调度过程中需要使用到第三方的 jar 或者用户需要自定义脚本的情况，可以通过在该页面完成相关操作。可创建的文件类型包括：<code>txt/log/sh/conf/py/java</code> 等。并且可以对文件进行编辑、重命名、下载和删除等操作。</p>\n<h2>基础操作</h2>\n<p><img src=\"/img/new_ui/dev/resource/file-manage.png\" alt=\"file-manage\"></p>\n<h3>创建文件</h3>\n<p>文件格式支持以下几种类型：txt、log、sh、conf、cfg、py、java、sql、xml、hql、properties</p>\n<p><img src=\"/img/new_ui/dev/resource/create-file.png\" alt=\"create-file\"></p>\n<h3>上传文件</h3>\n<p>上传文件：点击"上传文件"按钮进行上传，将文件拖拽到上传区域，文件 [...]
+ "__html": "<h1>文件管理</h1>\n<p>当在调度过程中需要使用到第三方的 jar 或者用户需要自定义脚本的情况，可以通过在该页面完成相关操作。可创建的文件类型包括：<code>txt/log/sh/conf/py/java</code> 等。并且可以对文件进行编辑、重命名、下载和删除等操作。</p>\n<blockquote>\n<p><strong><em>注意：</em></strong></p>\n<ul>\n<li>当您以<code>admin</code>身份等入并操作文件时，需要先给<code>admin</code>设置租户</li>\n</ul>\n</blockquote>\n<h2>基础操作</h2>\n<p><img src=\"/img/new_ui/dev/resource/file-manage.png\" alt=\"file-manage\"></p>\n<h3>创建文件</h3>\n<p>文件格式支持以下几种类型：txt、log、sh、conf、cfg、py、java、sql、xml、hql、properties< [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/resource/file-manage.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/task/shell.html b/zh-cn/docs/dev/user_doc/guide/task/shell.html
index 4ca6303af..3cc0db745 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/shell.html
+++ b/zh-cn/docs/dev/user_doc/guide/task/shell.html
@@ -12,11 +12,10 @@
<body>
<div id="root"><div class="md2html docs-page" data-reactroot=""><header class="header-container header-container-dark"><div class="banner-tips"><div>🤔 有关于 Apache DolphinScheduler 的疑问，加入 Slack 频道来讨论他们 <a class="link-tips" href="https://join.slack.com/t/asf-dolphinscheduler/shared_invite/zt-omtdhuio-_JISsxYhiVsltmC5h38yfw">join #dolphinscheduler channel</a>! 🌟</div></div><div class="header-body"><span class="mobile-menu-btn mobile-menu-btn-dark"></span><a href="/zh-cn/index.html"><img cl [...]
<h2>综述</h2>
-<p>Shell 任务类型，用于创建 Shell 类型的任务并执行一系列的 Shell 脚本。worker 执行该任务的时候，会生成一个临时shell脚本，
-并使用与租户同名的 linux 用户执行这个脚本。</p>
+<p>Shell 任务类型，用于创建 Shell 类型的任务并执行一系列的 Shell 脚本。worker 执行该任务的时候，会生成一个临时 shell 脚本，并使用与租户同名的 linux 用户执行这个脚本。</p>
<h2>创建任务</h2>
<ul>
-<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入DAG编辑页面。</li>
+<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入 DAG 编辑页面。</li>
<li>工具栏中拖动 <img src="/img/tasks/icons/shell.png" width="15"/> 到画板中，即可完成创建。</li>
</ul>
<h2>任务参数</h2>
@@ -24,15 +23,15 @@
<li>任务名称：设置任务的名称。一个工作流定义中的节点名称是唯一的。</li>
<li>运行标志：标识这个节点是否能正常调度,如果不需要执行，可以打开禁止执行开关。</li>
<li>描述：描述该节点的功能。</li>
-<li>任务优先级：worker线程数不足时，根据优先级从高到低依次执行，优先级一样时根据先进先出原则执行。</li>
-<li>Worker分组：任务分配给worker组的机器机执行，选择Default，会随机选择一台worker机执行。</li>
+<li>任务优先级：worker 线程数不足时，根据优先级从高到低依次执行，优先级一样时根据先进先出原则执行。</li>
+<li>Worker 分组：任务分配给 worker 组的机器机执行，选择 Default，会随机选择一台 worker 机执行。</li>
<li>环境名称：配置运行脚本的环境。</li>
<li>失败重试次数：任务失败重新提交的次数，支持下拉和手填。</li>
<li>失败重试间隔：任务失败重新提交任务的时间间隔，支持下拉和手填。</li>
<li>超时告警：勾选超时告警、超时失败，当任务超过"超时时长"后，会发送告警邮件并且任务执行失败.</li>
-<li>脚本：用户开发的SHELL程序。</li>
+<li>脚本：用户开发的 SHELL 程序。</li>
<li>资源：是指脚本中需要调用的资源文件列表，资源中心-文件管理上传或创建的文件。</li>
-<li>自定义参数：是SHELL局部的用户自定义参数，会替换脚本中以${变量}的内容。</li>
+<li>自定义参数：是 SHELL 局部的用户自定义参数，会替换脚本中以 <code>${变量}</code> 的内容。</li>
<li>前置任务：选择当前任务的前置任务，会将被选择的前置任务设置为当前任务的上游。</li>
</ul>
<h2>任务样例</h2>
@@ -47,6 +46,7 @@
<p><img src="/img/tasks/demo/shell_custom_param.jpg" alt="demo-shell-custom-param"></p>
<h2>注意事项</h2>
<p>Shell 任务类型通过解析任务日志是否包含 <code>application_xxx_xxx</code> 的内容来判断是否 Yarn 任务，如果是则会将相应的 <code>application_id</code> 的状态作为当前 Shell 节点的运行状态判断，此时如果操作停止工作流则会 Kill 相应的 <code>application_id</code></p>
+<p>如果 Shell 任务中需要使用到用户自定义的脚本，可通过资源中心来上传对应的文件然后在 Shell 任务中引用他们，可参考：<a href="../resource/file-manage.md">文件管理</a>。</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="/asset/js/react/react-with-addons.min.js"></script>
<script src="/asset/js/react/react-dom.min.js"></script>
diff --git a/zh-cn/docs/dev/user_doc/guide/task/shell.json b/zh-cn/docs/dev/user_doc/guide/task/shell.json
index 8e03b47f7..2e00ba07f 100644
--- a/zh-cn/docs/dev/user_doc/guide/task/shell.json
+++ b/zh-cn/docs/dev/user_doc/guide/task/shell.json
@@ -1,6 +1,6 @@
{
"filename": "shell.md",
- "__html": "<h1>Shell</h1>\n<h2>综述</h2>\n<p>Shell 任务类型，用于创建 Shell 类型的任务并执行一系列的 Shell 脚本。worker 执行该任务的时候，会生成一个临时shell脚本，\n并使用与租户同名的 linux 用户执行这个脚本。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入DAG编辑页面。</li>\n<li>工具栏中拖动 <img src=\"/img/tasks/icons/shell.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>Shell</h1>\n<h2>综述</h2>\n<p>Shell 任务类型，用于创建 Shell 类型的任务并执行一系列的 Shell 脚本。worker 执行该任务的时候，会生成一个临时 shell 脚本，并使用与租户同名的 linux 用户执行这个脚本。</p>\n<h2>创建任务</h2>\n<ul>\n<li>点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入 DAG 编辑页面。</li>\n<li>工具栏中拖动 <img src=\"/img/tasks/icons/shell.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/shell.html",
"meta": {}
}
\ No newline at end of file