add doc & fix ci

apache · Jun 13, 2023 · cd42315 · cd42315
1 parent 7da800f
commit cd42315
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 3 deletions.
diff --git a/docs/docs/en/guide/task/flink.md b/docs/docs/en/guide/task/flink.md
@@ -35,6 +35,7 @@ Flink task type, used to execute Flink programs. For Flink nodes:
 | TaskManager memory size | Used to set the size of taskManager memories, which can be set according to the actual production environment.                                                                                                                                                          |
 | Number of TaskManager   | Used to set the number of taskManagers, which can be set according to the actual production environment.                                                                                                                                                                |
 | Parallelism             | Used to set the degree of parallelism for executing Flink tasks.                                                                                                                                                                                                        |
+| Yarn queue              | Used to set the yarn queue, use `default` queue by default.                                                                                                                                                                                                             |
 | Main program parameters | Set the input parameters for the Flink program and support the substitution of custom parameter variables.                                                                                                                                                              |
 | Optional parameters     | Support `--jar`, `--files`,` --archives`, `--conf` format.                                                                                                                                                                                                              |
 | Custom parameter        | It is a local user-defined parameter for Flink, and will replace the content with `${variable}` in the script.                                                                                                                                                          |

diff --git a/docs/docs/en/guide/task/map-reduce.md b/docs/docs/en/guide/task/map-reduce.md
@@ -30,6 +30,7 @@ MapReduce(MR) task type used for executing MapReduce programs. For MapReduce nod
 | The class of the main function | The **full path** of Main Class, the entry point of the MapReduce program.                                         |
 | Main jar package               | The jar package of the MapReduce program.                                                                          |
 | Task name                      | MapReduce task name.                                                                                               |
+| Yarn queue                     | Used to set the yarn queue, use `default` queue by default.                                                        |
 | Command line parameters        | Set the input parameters of the MapReduce program and support the substitution of custom parameter variables.      |
 | Other parameters               | Support `-D`, `-files`, `-libjars`, `-archives` format.                                                            |
 | User-defined parameter         | It is a local user-defined parameter for MapReduce, and will replace the content with `${variable}` in the script. |

diff --git a/docs/docs/en/guide/task/spark.md b/docs/docs/en/guide/task/spark.md
@@ -33,6 +33,7 @@ Spark task type for executing Spark application. When executing the Spark task,
 | Driver memory size         | Set the size of Driver memories, which can be set according to the actual production environment.                                  |
 | Number of Executor         | Set the number of Executor, which can be set according to the actual production environment.                                       |
 | Executor memory size       | Set the size of Executor memories, which can be set according to the actual production environment.                                |
+| Yarn queue                 | Set the yarn queue, use `default` queue by default.                                                                                |
 | Main program parameters    | Set the input parameters of the Spark program and support the substitution of custom parameter variables.                          |
 | Optional parameters        | Support `--jars`, `--files`,` --archives`, `--conf` format.                                                                        |
 | Resource                   | Appoint resource files in the `Resource` if parameters refer to them.                                                              |

diff --git a/docs/docs/zh/guide/task/flink.md b/docs/docs/zh/guide/task/flink.md
@@ -35,6 +35,7 @@ Flink 任务类型，用于执行 Flink 程序。对于 Flink 节点：
 | taskManager 内存数 | 用于设置 taskManager 内存数，可根据实际生产环境设置对应的内存数                                                                                                                                                                                                     |
 | taskManager 数量  | 用于设置 taskManager 的数量，可根据实际生产环境设置对应的数量                                                                                                                                                                                                      |
 | 并行度             | 用于设置执行 Flink 任务的并行度                                                                                                                                                                                                                        |
+| Yarn 队列         | 用于设置 Yarn 队列，默认使用 default 队列                                                                                                                                                                                                               |
 | 主程序参数           | 设置 Flink 程序的输入参数，支持自定义参数变量的替换                                                                                                                                                                                                              |
 | 选项参数            | 支持 `--jar`、`--files`、`--archives`、`--conf` 格式                                                                                                                                                                                              |
 | 自定义参数           | 是 Flink 局部的用户自定义参数，会替换脚本中以 ${变量} 的内容                                                                                                                                                                                                       |

diff --git a/docs/docs/zh/guide/task/map-reduce.md b/docs/docs/zh/guide/task/map-reduce.md
@@ -24,6 +24,7 @@ MapReduce(MR) 任务类型，用于执行 MapReduce 程序。对于 MapReduce
 | 主函数的 Class | 是 MapReduce 程序的入口 Main Class 的**全路径**    |
 | 主程序包       | 执行 MapReduce 程序的 jar 包                   |
 | 任务名称（选填）   | MapReduce 任务名称                           |
+| Yarn 队列    | 设置 Yarn 队列，默认使用 default                  |
 | 命令行参数      | 是设置 MapReduce 程序的输入参数，支持自定义参数变量的替换       |
 | 其他参数       | 支持 –D、-files、-libjars、-archives 格式       |
 | 自定义参数      | 是 MapReduce 局部的用户自定义参数，会替换脚本中以 ${变量} 的内容 |

diff --git a/docs/docs/zh/guide/task/spark.md b/docs/docs/zh/guide/task/spark.md
@@ -32,6 +32,7 @@ Spark  任务类型用于执行 Spark 应用。对于 Spark 节点，worker 支
 - Driver 内存数：用于设置 Driver 内存数，可根据实际生产环境设置对应的内存数。
 - Executor 数量：用于设置 Executor 的数量，可根据实际生产环境设置对应的内存数。
 - Executor 内存数：用于设置 Executor 内存数，可根据实际生产环境设置对应的内存数。
+- Yarn 队列：用于设置 Yarn 队列，默认使用 default 队列。
 - 主程序参数：设置 Spark 程序的输入参数，支持自定义参数变量的替换。
 - 选项参数：支持 `--jars`、`--files`、`--archives`、`--conf` 格式。
 - 资源：如果其他参数中引用了资源文件，需要在资源中选择指定。

diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -849,7 +849,7 @@ export default {
     child_node_definition: 'child node definition',
     child_node_instance: 'child node instance',
     yarn_queue: 'Yarn Queue',
-    yarn_queue_tips: 'Please input yarn queue',
+    yarn_queue_tips: 'Please input yarn queue(optional)',
   },
   menu: {
     fav: 'Favorites',

diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -825,7 +825,7 @@ export default {
     child_node_definition: '子节点定义',
     child_node_instance: '子节点实例',
     yarn_queue: 'Yarn队列',
-    yarn_queue_tips: '请输入Yarn队列',
+    yarn_queue_tips: '请输入Yarn队列(选填)',
   },
   menu: {
     fav: '收藏组件',

diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-mr.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-mr.ts
@@ -16,7 +16,7 @@
  */
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useCustomParams, useMainJar, useResources } from '.'
+import { useCustomParams, useMainJar, useResources, useYarnQueue } from '.'
 import type { IJsonItem } from '../types'
 
 export function useMr(model: { [field: string]: any }): IJsonItem[] {
@@ -68,6 +68,7 @@ export function useMr(model: { [field: string]: any }): IJsonItem[] {
         placeholder: t('project.node.app_name_tips')
       }
     },
+    useYarnQueue(),
     {
       type: 'input',
       field: 'mainArgs',

diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts
@@ -223,6 +223,7 @@ interface ISparkParameters {
   executorMemory?: string
   numExecutors?: number
   others?: string
+  yarnQueue?: string
 }
 
 interface IRuleParameters {