props.showModalRef,
- () => {
- props.showModalRef && getListData()
- }
- )
-
- watch(
- () => props.statusRef,
- () => {
- if (props.statusRef === 0) {
- variables.model.namespace = ''
- variables.model.clusterCode = ''
- variables.model.limitsCpu = ''
- variables.model.limitsMemory = ''
- variables.model.userId = ''
- } else {
- variables.model.id = props.row.id
- variables.model.namespace = props.row.namespace
- variables.model.clusterCode = props.row.clusterCode
- variables.model.limitsCpu = props.row.limitsCpu + ''
- variables.model.limitsMemory = props.row.limitsMemory + ''
- variables.model.userId = props.row.userId
- }
- }
+ () => props.showModalRef,
+ () => {
+ props.showModalRef && getListData()
+ }
)
watch(
- () => props.row,
- () => {
+ () => props.statusRef,
+ () => {
+ if (props.statusRef === 0) {
+ variables.model.namespace = ''
+ variables.model.clusterCode = ''
+ variables.model.limitsCpu = ''
+ variables.model.limitsMemory = ''
+ variables.model.userId = ''
+ } else {
variables.model.id = props.row.id
variables.model.namespace = props.row.namespace
variables.model.clusterCode = props.row.clusterCode
@@ -103,6 +96,19 @@ const K8sNamespaceModal = defineComponent({
variables.model.limitsMemory = props.row.limitsMemory + ''
variables.model.userId = props.row.userId
}
+ }
+ )
+
+ watch(
+ () => props.row,
+ () => {
+ variables.model.id = props.row.id
+ variables.model.namespace = props.row.namespace
+ variables.model.clusterCode = props.row.clusterCode
+ variables.model.limitsCpu = props.row.limitsCpu + ''
+ variables.model.limitsMemory = props.row.limitsMemory + ''
+ variables.model.userId = props.row.userId
+ }
)
return { t, ...toRefs(variables), cancelModal, confirmModal, trim }
@@ -110,83 +116,87 @@ const K8sNamespaceModal = defineComponent({
render() {
const { t } = this
return (
-
-
- {{
- default: () => (
-
-
-
-
-
-
-
-
-
-
- CORE
-
-
-
-
-
- GB
-
-
-
- )
- }}
-
-
+
+
+ {{
+ default: () => (
+
+
+
+
+
+
+
+
+
+
+ CORE
+
+
+
+
+
+ GB
+
+
+
+ )
+ }}
+
+
)
}
})
-export default K8sNamespaceModal
\ No newline at end of file
+export default K8sNamespaceModal
diff --git a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/components/use-modal.ts b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/components/use-modal.ts
index 92248c7175..63c75ba29c 100644
--- a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/components/use-modal.ts
+++ b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/components/use-modal.ts
@@ -26,8 +26,8 @@ import { queryAllClusterList } from '@/service/modules/cluster'
import { useAsyncState } from '@vueuse/core'
export function useModal(
- props: any,
- ctx: SetupContext<('cancelModal' | 'confirmModal')[]>
+ props: any,
+ ctx: SetupContext<('cancelModal' | 'confirmModal')[]>
) {
const { t } = useI18n()
@@ -73,8 +73,8 @@ export function useModal(
try {
statusRef === 0
- ? await submitK8SNamespaceModal()
- : await updateK8SNamespaceModal()
+ ? await submitK8SNamespaceModal()
+ : await updateK8SNamespaceModal()
variables.saving = false
} catch (err) {
variables.saving = false
@@ -83,23 +83,23 @@ export function useModal(
const getListData = () => {
const { state } = useAsyncState(
- queryAllClusterList().then((res: any) => {
- variables.model.clusterOptions = res
- .filter((item: any) => {
- if (item.config) {
- const k8s = JSON.parse(item.config).k8s
- return !!k8s
- }
- return false
- })
- .map((item: any) => {
- return {
- label: item.name,
- value: item.code
- }
- })
- }),
- {}
+ queryAllClusterList().then((res: any) => {
+ variables.model.clusterOptions = res
+ .filter((item: any) => {
+ if (item.config) {
+ const k8s = JSON.parse(item.config).k8s
+ return !!k8s
+ }
+ return false
+ })
+ .map((item: any) => {
+ return {
+ label: item.name,
+ value: item.code
+ }
+ })
+ }),
+ {}
)
return state
@@ -120,9 +120,9 @@ export function useModal(
const updateK8SNamespaceModal = () => {
updateK8sNamespace(variables.model, variables.model.id).then(
- (ignored: any) => {
- ctx.emit('confirmModal', props.showModalRef)
- }
+ (ignored: any) => {
+ ctx.emit('confirmModal', props.showModalRef)
+ }
)
}
@@ -131,4 +131,4 @@ export function useModal(
handleValidate,
getListData
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
index 07eda28cea..e41c79cc27 100644
--- a/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
+++ b/dolphinscheduler-ui/src/views/security/k8s-namespace-manage/index.tsx
@@ -15,7 +15,13 @@
* limitations under the License.
*/
-import { defineComponent, getCurrentInstance, onMounted, toRefs, watch } from 'vue'
+import {
+ defineComponent,
+ getCurrentInstance,
+ onMounted,
+ toRefs,
+ watch
+} from 'vue'
import {
NButton,
NDataTable,
@@ -112,7 +118,7 @@ const k8sNamespaceManage = defineComponent({
1
- ? variables.page - 1
- : variables.page,
+ variables.tableData.length === 1 && variables.page > 1
+ ? variables.page - 1
+ : variables.page,
searchVal: variables.searchVal
})
})
@@ -104,61 +104,61 @@ export function useTable() {
return h(NSpace, null, {
default: () => [
h(
- NTooltip,
- {},
- {
- trigger: () =>
- h(
+ NTooltip,
+ {},
+ {
+ trigger: () =>
+ h(
+ NButton,
+ {
+ circle: true,
+ type: 'info',
+ size: 'small',
+ onClick: () => {
+ handleEdit(row)
+ }
+ },
+ {
+ icon: () =>
+ h(NIcon, null, { default: () => h(EditOutlined) })
+ }
+ ),
+ default: () => t('security.k8s_namespace.edit')
+ }
+ ),
+ h(
+ NPopconfirm,
+ {
+ onPositiveClick: () => {
+ handleDelete(row)
+ }
+ },
+ {
+ trigger: () =>
+ h(
+ NTooltip,
+ {},
+ {
+ trigger: () =>
+ h(
NButton,
{
circle: true,
- type: 'info',
- size: 'small',
- onClick: () => {
- handleEdit(row)
- }
+ type: 'error',
+ size: 'small'
},
{
icon: () =>
- h(NIcon, null, { default: () => h(EditOutlined) })
+ h(NIcon, null, {
+ default: () => h(DeleteOutlined)
+ })
}
- ),
- default: () => t('security.k8s_namespace.edit')
- }
- ),
- h(
- NPopconfirm,
- {
- onPositiveClick: () => {
- handleDelete(row)
- }
- },
- {
- trigger: () =>
- h(
- NTooltip,
- {},
- {
- trigger: () =>
- h(
- NButton,
- {
- circle: true,
- type: 'error',
- size: 'small'
- },
- {
- icon: () =>
- h(NIcon, null, {
- default: () => h(DeleteOutlined)
- })
- }
- ),
- default: () => t('security.k8s_namespace.delete')
- }
- ),
- default: () => t('security.k8s_namespace.delete_confirm')
- }
+ ),
+ default: () => t('security.k8s_namespace.delete')
+ }
+ ),
+ default: () => t('security.k8s_namespace.delete_confirm')
+ }
)
]
})
@@ -188,24 +188,24 @@ export function useTable() {
if (variables.loadingRef) return
variables.loadingRef = true
const { state } = useAsyncState(
- queryNamespaceListPaging({ ...params }).then((res: NamespaceListRes) => {
- variables.tableData = res.totalList.map((item, unused) => {
- item.createTime = format(
- parseTime(item.createTime),
- 'yyyy-MM-dd HH:mm:ss'
- )
- item.updateTime = format(
- parseTime(item.updateTime),
- 'yyyy-MM-dd HH:mm:ss'
- )
- return {
- ...item
- }
- }) as any
- variables.totalPage = res.totalPage
- variables.loadingRef = false
- }),
- {}
+ queryNamespaceListPaging({ ...params }).then((res: NamespaceListRes) => {
+ variables.tableData = res.totalList.map((item, unused) => {
+ item.createTime = format(
+ parseTime(item.createTime),
+ 'yyyy-MM-dd HH:mm:ss'
+ )
+ item.updateTime = format(
+ parseTime(item.updateTime),
+ 'yyyy-MM-dd HH:mm:ss'
+ )
+ return {
+ ...item
+ }
+ }) as any
+ variables.totalPage = res.totalPage
+ variables.loadingRef = false
+ }),
+ {}
)
return state
@@ -216,4 +216,4 @@ export function useTable() {
getTableData,
createColumns
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-ui/src/views/security/tenant-manage/components/tenant-modal.tsx b/dolphinscheduler-ui/src/views/security/tenant-manage/components/tenant-modal.tsx
index fd3086d843..ffdc73534f 100644
--- a/dolphinscheduler-ui/src/views/security/tenant-manage/components/tenant-modal.tsx
+++ b/dolphinscheduler-ui/src/views/security/tenant-manage/components/tenant-modal.tsx
@@ -15,7 +15,13 @@
* limitations under the License.
*/
-import { defineComponent, getCurrentInstance, PropType, toRefs, watch } from 'vue'
+import {
+ defineComponent,
+ getCurrentInstance,
+ PropType,
+ toRefs,
+ watch
+} from 'vue'
import Modal from '@/components/modal'
import { NForm, NFormItem, NInput, NSelect } from 'naive-ui'
import { useModalData } from './use-modalData'
@@ -123,7 +129,7 @@ const TenantModal = defineComponent({
path='tenantCode'
>
+ allowInput={this.trim}
+ v-model:value={this.searchVal}
+ size='small'
+ clearable
+ />
diff --git a/dolphinscheduler-ui/src/views/security/worker-group-manage/components/worker-group-modal.tsx b/dolphinscheduler-ui/src/views/security/worker-group-manage/components/worker-group-modal.tsx
index b84f0ba84b..156810e21d 100644
--- a/dolphinscheduler-ui/src/views/security/worker-group-manage/components/worker-group-modal.tsx
+++ b/dolphinscheduler-ui/src/views/security/worker-group-manage/components/worker-group-modal.tsx
@@ -15,7 +15,13 @@
* limitations under the License.
*/
-import { defineComponent, getCurrentInstance, PropType, toRefs, watch } from 'vue'
+import {
+ defineComponent,
+ getCurrentInstance,
+ PropType,
+ toRefs,
+ watch
+} from 'vue'
import Modal from '@/components/modal'
import { NForm, NFormItem, NInput, NSelect } from 'naive-ui'
import { useModal } from './use-modal'
@@ -118,7 +124,7 @@ const WorkerGroupModal = defineComponent({
path='name'
>
from the toolbar to the canvas.
+
+## Task Parameters
+
+| **Parameter** | **Description** |
+|------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Node Name | The name of the task. Node names within the same workflow must be unique. |
+| Run Flag | Indicating whether to schedule the task. If you do not need to execute the task, you can turn on the `Prohibition execution` switch. |
+| Description | Describing the function of this node. |
+| Task Priority | When the number of the worker threads is insufficient, the worker executes task according to the priority. When two tasks have the same priority, the worker will execute them in `first come first served` fashion. |
+| Worker Group | Machines which execute the tasks. If you choose `default`, scheduler will send the task to a random worker. |
+| Task Group Name | Resource group of tasks. It will not take effect if not configured. |
+| Environment Name | Environment to execute the task. |
+| Number of Failed Retries | The number of task retries for failures. You could select it by drop-down menu or fill it manually. |
+| Failure Retry Interval | Interval of task retries for failures. You could select it by drop-down menu or fill it manually. |
+| CPU Quota | Assign the specified CPU time quota to the task executed. Takes a percentage value. Default -1 means unlimited. For example, the full CPU load of one core is 100%, and that of 16 cores is 1600%. You could configure it by [task.resource.limit.state](../../architecture/configuration.md). |
+| Max Memory | Assign the specified max memory to the task executed. Exceeding this limit will trigger oom to be killed and will not automatically retry. Takes an MB value. Default -1 means unlimited. You could configure it by [task.resource.limit.state](../../architecture/configuration.md). |
+| Timeout Alarm | Alarm for task timeout. When the task exceeds the "timeout threshold", an alarm email will send. |
+| Hive Cli Task Execution Type | The type of hive cli task execution, choose either `FROM_SCRIPT` or `FROM_FILE`. |
+| Hive SQL Script | If you choose `FROM_SCRIPT` for `Hive Cli Task Execution Type`, you need to fill in your SQL script. |
+| Hive Cli Options | Extra options for hive cli, such as `--verbose` |
+| Resources | If you choose `FROM_FILE` for `Hive Cli Task Execution Type`, you need to select your SQL file. |
+
+## Task Example
+
+### Hive Cli Task Example
+
+This example below illustrates how to create a `Hive CLI` task node and execute hive SQL from script:
+
+
+
+This example below illustrates how to create a `Hive CLI` task node and execute hive SQL from file:
+
+
diff --git a/docs/docs/zh/guide/task/hive-cli.md b/docs/docs/zh/guide/task/hive-cli.md
new file mode 100644
index 0000000000..54b5e4db12
--- /dev/null
+++ b/docs/docs/zh/guide/task/hive-cli.md
@@ -0,0 +1,57 @@
+# Hive CLI
+
+## 综述
+
+使用`Hive Cli任务插件`创建`Hive Cli`类型的任务执行SQL脚本语句或者SQL任务文件。
+执行任务的worker会通过`hive -e`命令执行hive SQL脚本语句或者通过`hive -f`命令执行`资源中心`中的hive SQL文件。
+
+## Hive CLI任务 VS 连接Hive数据源的SQL任务
+
+在DolphinScheduler中，我们有`Hive CLI任务插件`和`使用Hive数据源的SQL插件`提供用户在不同场景下使用，您可以根据需要进行选择。
+
+- `Hive CLI任务插件`直接连接`HDFS`和`Hive Metastore`来执行hive类型的任务，所以需要能够访问到对应的服务。
+ 执行任务的worker节点需要有相应的`Hive` jar包以及`Hive`和`HDFS`的配置文件。
+ 但是在生产调度中，`Hive CLI任务插件`能够提供更可靠的稳定性。
+- `使用Hive数据源的SQL插件`不需要您在worker节点上有相应的`Hive` jar包以及`Hive`和`HDFS`的配置文件，而且支持 `Kerberos`认证。
+ 但是在生产调度中，若调度压力很大，使用这种方式可能会遇到`HiveServer2`服务过载失败等问题。
+
+## 创建任务
+
+- 点击项目管理-项目名称-工作流定义，点击"创建工作流"按钮，进入DAG编辑页面。
+- 工具栏中拖动