Skip to content

D
dlink
Commit 53710e6e authored by wenmo's avatar wenmo
Browse files
Options

新增 作业生命周期与任务实例同步联动

parent 1b21aa6f
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 173 deletions
dlink-admin/src/main/java/com/dlink/controller/TaskController.java
View file @ 53710e6e
......@@ -159,7 +159,7 @@ public class TaskController {
*/
@GetMapping(value = "/cancelTask")
public Result cancelTask(@RequestParam Integer id) {
return Result.succeed(taskService.cancelTask(id),"操作成功");
return taskService.cancelTask(id);
}
/**
......
dlink-admin/src/main/java/com/dlink/service/TaskService.java
View file @ 53710e6e
......@@ -46,7 +46,7 @@ public interface TaskService extends ISuperService<Task> {
Result offLineTask(Integer id, String type);
boolean cancelTask(Integer id);
Result cancelTask(Integer id);
boolean recoveryTask(Integer id);
......
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @ 53710e6e
......@@ -349,7 +349,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
task.setStep(JobLifeCycle.ONLINE.getValue());
task.setJobInstanceId(jobResult.getJobInstanceId());
if (updateById(task)) {
return Result.succeed("上线成功");
return Result.succeed(jobResult,"上线成功");
} else {
return Result.failed("由于未知原因，上线失败");
}
......@@ -383,14 +383,21 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
}
@Override
public boolean cancelTask(Integer id) {
public Result cancelTask(Integer id) {
Task task = getById(id);
Assert.check(task);
if (JobLifeCycle.ONLINE != JobLifeCycle.get(task.getStep())) {
if(Asserts.isNotNull(task.getJobInstanceId())&&task.getJobInstanceId()!=0){
return Result.failed("当前有作业正在运行，注销失败，请停止后注销");
}
task.setStep(JobLifeCycle.CANCEL.getValue());
return updateById(task);
if (updateById(task)) {
return Result.succeed("注销成功");
} else {
return Result.failed("由于未知原因，注销失败");
}
}
return false;
return Result.failed("当前有作业已上线，无法注销，请下线后注销");
}
@Override
......
dlink-web/src/components/Studio/StudioMenu/index.tsx
View file @ 53710e6e
......@@ -26,7 +26,16 @@ import {
} from "@/components/Studio/StudioEvent/DDL";
import React, {useCallback, useEffect, useState} from "react";
import StudioExplain from "../StudioConsole/StudioExplain";
import {DIALECT, isOnline, isSql, TASKSTEPS} from "@/components/Studio/conf";
import {
DIALECT,
isDeletedTask,
isExecuteSql,
isOnline,
isRunningTask,
isSql,
isTask,
TASKSTEPS
} from "@/components/Studio/conf";
import {
ModalForm,
} from '@ant-design/pro-form';
......@@ -110,7 +119,7 @@ const StudioMenu = (props: any) => {
result.then(res => {
notification.close(taskKey);
if (res.datas.success) {
props.changeTaskJobInstance(current.task.id,res.datas.jobInstanceId);
res.datas?.jobInstanceId&&props.changeTaskJobInstance(current.task.id,res.datas?.jobInstanceId);
message.success('执行成功');
} else {
message.error('执行失败');
......@@ -155,7 +164,7 @@ const StudioMenu = (props: any) => {
const res = await postDataArray('/api/task/submit', [task.id]);
notification.close(taskKey);
if (res.datas[0].success) {
props.changeTaskJobInstance(current.task.id,res.datas[0].jobInstanceId);
res.datas[0].jobInstanceId && props.changeTaskJobInstance(current.task.id,res.datas[0].jobInstanceId);
message.success('异步提交成功');
} else {
message.success('异步提交失败');
......@@ -317,8 +326,9 @@ const StudioMenu = (props: any) => {
onOk: async () => {
const res = onLineTask(current.task.id);
res.then((result) => {
if(result.code == CODE.SUCCESS) {
if(result.code === CODE.SUCCESS) {
props.changeTaskStep(current.task.id,TASKSTEPS.ONLINE);
result.datas?.jobInstanceId && props.changeTaskJobInstance(current.task.id,result.datas?.jobInstanceId);
message.success(`上线作业【${current.task.alias}】成功`);
}else {
message.error(`上线作业【${current.task.alias}】失败，原因：\n${result.msg}`);
......@@ -337,7 +347,10 @@ const StudioMenu = (props: any) => {
onOk: async () => {
const res = offLineTask(current.task.id,type);
res.then((result) => {
if(result.code == CODE.SUCCESS) {
if(result.code === CODE.SUCCESS) {
if(current.task.step === TASKSTEPS.ONLINE){
props.changeTaskStep(current.task.id,TASKSTEPS.RELEASE);
}
props.changeTaskJobInstance(current.task.id,0);
message.success(`停止作业【${current.task.alias}】成功`);
}else {
......@@ -357,8 +370,9 @@ const StudioMenu = (props: any) => {
onOk: async () => {
const res = offLineTask(current.task.id,type);
res.then((result) => {
if(result.code == CODE.SUCCESS) {
if(result.code === CODE.SUCCESS) {
props.changeTaskStep(current.task.id,TASKSTEPS.RELEASE);
props.changeTaskJobInstance(current.task.id,0);
message.success(`下线作业【${current.task.alias}】成功`);
}else {
message.error(`下线作业【${current.task.alias}】失败，原因：\n${result.msg}`);
......@@ -377,9 +391,11 @@ const StudioMenu = (props: any) => {
onOk: async () => {
const res = cancelTask(current.task.id);
res.then((result) => {
result.datas && props.changeTaskStep(current.task.id,TASKSTEPS.CANCEL);
if(result.code == CODE.SUCCESS) {
if(result.code === CODE.SUCCESS) {
props.changeTaskStep(current.task.id,TASKSTEPS.CANCEL);
message.success(`注销作业【${current.task.alias}】成功`);
}else {
message.error(`注销作业【${current.task.alias}】失败，原因：\n${result.msg}`);
}
});
}
......@@ -404,6 +420,22 @@ const StudioMenu = (props: any) => {
});
};
const isShowGetStreamGraphBtn = () => {
return (!current.task.dialect||current.task.dialect === DIALECT.FLINKSQL);
};
const isShowExecuteBtn = () => {
return !isDeletedTask(current.task.step) && isExecuteSql( current.task.dialect ) && !isRunningTask(current.task.jobInstanceId);
};
const isShowSubmitBtn = () => {
return !isDeletedTask(current.task.step) && isTask( current.task.dialect ) && !isRunningTask(current.task.jobInstanceId);
};
const isShowCancelTaskBtn = () => {
return !isDeletedTask(current.task.step) && isTask( current.task.dialect ) && isRunningTask(current.task.jobInstanceId);
};
const runMenu = (
<Menu>
<Menu.Item onClick={execute}>SQL 查询</Menu.Item>
......@@ -414,7 +446,7 @@ const StudioMenu = (props: any) => {
const getPathItem = (paths) => {
let itemList = [];
for (let item of paths) {
itemList.push(<Breadcrumb.Item>{item}</Breadcrumb.Item>)
itemList.push(<Breadcrumb.Item key={item}>{item}</Breadcrumb.Item>)
}
return itemList;
};
......@@ -430,6 +462,7 @@ const StudioMenu = (props: any) => {
},
});
};
return (
<Row className={styles.container}>
<Col span={24}>
......@@ -470,76 +503,68 @@ const StudioMenu = (props: any) => {
</Col>
<Col span={12}>
{currentSession.session &&
(
<Breadcrumb className={styles["dw-path"]}>
<Divider type="vertical"/>
<MessageOutlined/>
<Divider type="vertical"/>
{currentSession.session}
<Divider type="vertical"/>
<ClusterOutlined/>
<Divider type="vertical"/>
{currentSession.sessionConfig.useRemote ?
currentSession.sessionConfig.clusterName : '本地模式'}
</Breadcrumb>
)}
(
<Breadcrumb className={styles["dw-path"]}>
<Divider type="vertical"/>
<MessageOutlined/>
<Divider type="vertical"/>
{currentSession.session}
<Divider type="vertical"/>
<ClusterOutlined/>
<Divider type="vertical"/>
{currentSession.sessionConfig.useRemote ?
currentSession.sessionConfig.clusterName : '本地模式'}
</Breadcrumb>
)}
</Col>
{current?.task?
<Col span={8}>
<Tooltip title="全屏开发">
<Button
type="text"
icon={<CodeTwoTone />}
onClick={toFullScreen}
/>
</Tooltip>
<Button
type="text"
icon={<FileAddTwoTone twoToneColor="#ddd"/>}
/>
<Button
type="text"
icon={<FolderOpenTwoTone twoToneColor="#ddd"/>}
/>
<Tooltip title="保存当前的 FlinkSql 及配置">
<Button
type="text"
icon={<SaveTwoTone/>}
onClick={saveSqlAndSettingToTask}
/>
</Tooltip>
<Tooltip title="导出当前的 Sql 及配置">
<Button
type="text"
icon={<SnippetsTwoTone />}
onClick={exportSql}
/>
</Tooltip>
<Divider type="vertical"/>
<Tooltip title="检查当前的 FlinkSql">
<Col span={8}>
<Tooltip title="全屏开发">
<Button
type="text"
icon={<CodeTwoTone />}
onClick={toFullScreen}
/>
</Tooltip>
<Button
type="text"
icon={<SafetyCertificateTwoTone/>}
onClick={onCheckSql}
icon={<FileAddTwoTone twoToneColor="#ddd"/>}
/>
</Tooltip>
{(!current.task.dialect||current.task.dialect === DIALECT.FLINKSQL) &&(
<Tooltip title="获取当前的 FlinkSql 的执行图">
<Button
type="text"
icon={<FlagTwoTone/>}
onClick={onGetStreamGraph}
icon={<FolderOpenTwoTone twoToneColor="#ddd"/>}
/>
</Tooltip>)}
{ current.task.jobInstanceId&&(current.task.jobInstanceId != 0) ?
<Tooltip title="停止">
<Tooltip title="保存当前的 FlinkSql 及配置">
<Button
type="text"
icon={<PauseCircleTwoTone />}
onClick={()=>handleCancelTask('canceljob')}
icon={<SaveTwoTone/>}
onClick={saveSqlAndSettingToTask}
/>
</Tooltip>
<Tooltip title="导出当前的 Sql 及配置">
<Button
type="text"
icon={<SnippetsTwoTone />}
onClick={exportSql}
/>
</Tooltip>
<Divider type="vertical"/>
<Tooltip title="检查当前的 FlinkSql">
<Button
type="text"
icon={<SafetyCertificateTwoTone/>}
onClick={onCheckSql}
/>
</Tooltip>:<>
{(!current.task.dialect||current.task.dialect === DIALECT.FLINKSQL||isSql( current.task.dialect )) &&(
</Tooltip>
{isShowGetStreamGraphBtn() &&(
<Tooltip title="获取当前的 FlinkSql 的执行图">
<Button
type="text"
icon={<FlagTwoTone/>}
onClick={onGetStreamGraph}
/>
</Tooltip>)}
{isShowExecuteBtn() &&(
<Tooltip title="执行当前的 SQL">
<Button
type="text"
......@@ -548,7 +573,7 @@ const StudioMenu = (props: any) => {
onClick={execute}
/>
</Tooltip>)}
{(!current.task.dialect||current.task.dialect === DIALECT.FLINKSQL||current.task.dialect === DIALECT.FLINKJAR||isSql( current.task.dialect )) &&(<>
{isShowSubmitBtn() &&(<>
<Tooltip title="提交当前的作业到集群，提交前请手动保存">
<Button
type="text"
......@@ -557,64 +582,72 @@ const StudioMenu = (props: any) => {
/>
</Tooltip>
</>)}
</>
}
<Divider type="vertical"/>
{current.task.step == TASKSTEPS.DEVELOP ?
<Tooltip title="发布，发布后将无法修改">
<Button
type="text"
icon={<CameraTwoTone/>}
onClick={toReleaseTask}
/>
</Tooltip>:undefined
}{current.task.step == TASKSTEPS.RELEASE ?
{isShowCancelTaskBtn() &&
<Tooltip title="停止">
<Button
type="text"
icon={<PauseCircleTwoTone />}
onClick={()=>handleCancelTask('canceljob')}
/>
</Tooltip>
}
<Divider type="vertical"/>
{current.task.step == TASKSTEPS.DEVELOP ?
<Tooltip title="发布，发布后将无法修改">
<Button
type="text"
icon={<CameraTwoTone/>}
onClick={toReleaseTask}
/>
</Tooltip>:undefined
}{current.task.step == TASKSTEPS.RELEASE ?
<><Tooltip title="维护，点击进入编辑状态">
<Button
type="text"
icon={<EditTwoTone />}
onClick={toDevelopTask}
/>
</Tooltip><Tooltip title="上线，上线后自动恢复、告警等将生效">
<Button
type="text"
icon={<CarryOutTwoTone />}
onClick={toOnLineTask}
/>
</Tooltip></>:undefined
</Tooltip>
<Tooltip title="上线，上线后自动恢复、告警等将生效">
<Button
type="text"
icon={<CarryOutTwoTone />}
onClick={toOnLineTask}
/>
</Tooltip></>:undefined
}{current.task.step == TASKSTEPS.ONLINE ?
<Tooltip title="下线，将进入最新发布状态">
<Button
type="text"
icon={<PauseCircleTwoTone />}
onClick={()=>toOffLineTask('cancel')}
/>
</Tooltip>:undefined
}{(current.task.step != TASKSTEPS.ONLINE && current.task.step != TASKSTEPS.CANCEL) ?
<Tooltip title="注销，将进入回收站">
<Button
type="text"
icon={<DeleteTwoTone />}
onClick={toCancelTask}
/>
</Tooltip>:undefined
}{current.task.step == TASKSTEPS.CANCEL ?
<Tooltip title="恢复，将进入维护模式">
<Button
type="text"
icon={<RestTwoTone />}
onClick={toRecoveryTask}
/>
</Tooltip>:undefined
}
<Tooltip title="查看使用帮助">
<Button
type="text"
icon={<QuestionCircleTwoTone/>}
onClick={showHelp}
/>
</Tooltip>
</Col>:undefined}
<Tooltip title="下线，将进入最新发布状态">
<Button
type="text"
icon={<PauseCircleTwoTone />}
onClick={()=>toOffLineTask('cancel')}
/>
</Tooltip>:undefined
}{(current.task.step != TASKSTEPS.ONLINE && current.task.step != TASKSTEPS.CANCEL) ?
<Tooltip title="注销，将进入回收站">
<Button
type="text"
icon={<DeleteTwoTone />}
onClick={toCancelTask}
/>
</Tooltip>:undefined
}{current.task.step == TASKSTEPS.CANCEL ?
<Tooltip title="恢复，将进入维护模式">
<Button
type="text"
icon={<RestTwoTone />}
onClick={toRecoveryTask}
/>
</Tooltip>:undefined
}
<Tooltip title="查看使用帮助">
<Button
type="text"
icon={<QuestionCircleTwoTone/>}
onClick={showHelp}
/>
</Tooltip>
</Col>:undefined}
</Row>
</Col>
<StudioExplain
......@@ -632,27 +665,27 @@ const StudioMenu = (props: any) => {
<StudioGraph data={graphData} />
</Modal>
{current?.task?
<ModalForm
title={`${current.task.alias} 的 ${current.task.dialect} 导出`}
visible={exportModalVisible}
width={1000}
modalProps={{
maskClosable:false,
bodyStyle:{
padding: '5px'
}
}}
onVisibleChange={handleExportModalVisible}
submitter={{
submitButtonProps: {
style: {
display: 'none',
<ModalForm
title={`${current.task.alias} 的 ${current.task.dialect} 导出`}
visible={exportModalVisible}
width={1000}
modalProps={{
maskClosable:false,
bodyStyle:{
padding: '5px'
}
}}
onVisibleChange={handleExportModalVisible}
submitter={{
submitButtonProps: {
style: {
display: 'none',
},
},
},
}}
>
<SqlExport id={current.task.id} />
</ModalForm>:undefined}
}}
>
<SqlExport id={current.task.id} />
</ModalForm>:undefined}
{current && isFullScreen?<Modal
width={width}
bodyStyle={{padding: 0}}
......@@ -663,7 +696,7 @@ const StudioMenu = (props: any) => {
visible={isFullScreen}
footer={null}
onCancel={() => {
props.changeFullScreen(false);
props.changeFullScreen(false);
}}>
<StudioTabs width={width} height={height}/>
</Modal>:undefined}
......@@ -688,7 +721,7 @@ const mapDispatchToProps = (dispatch: Dispatch)=>({
id,step
},
}),changeTaskJobInstance:(id: number, jobInstanceId: number)=>dispatch({
type: "Studio/changeTaskStep",
type: "Studio/changeTaskJobInstance",
payload: {
id,jobInstanceId
},
......
dlink-web/src/components/Studio/conf.ts
View file @ 53710e6e
export const RUN_MODE = {
LOCAL:'local',
STANDALONE:'standalone',
YARN_SESSION:'yarn-session',
YARN_PER_JOB:'yarn-per-job',
YARN_APPLICATION:'yarn-application',
KUBERNETES_SESSION:'kubernetes-session',
KUBERNETES_APPLICATION:'kubernetes-application',
LOCAL: 'local',
STANDALONE: 'standalone',
YARN_SESSION: 'yarn-session',
YARN_PER_JOB: 'yarn-per-job',
YARN_APPLICATION: 'yarn-application',
KUBERNETES_SESSION: 'kubernetes-session',
KUBERNETES_APPLICATION: 'kubernetes-application',
};
export const DIALECT = {
FLINKSQL:'FlinkSql',
FLINKJAR:'FlinkJar',
FLINKSQLENV:'FlinkSqlEnv',
SQL:'Sql',
MYSQL:'Mysql',
ORACLE:'Oracle',
SQLSERVER:'SqlServer',
POSTGRESQL:'PostGreSql',
CLICKHOUSE:'ClickHouse',
DORIS:'Doris',
JAVA:'Java',
FLINKSQL: 'FlinkSql',
FLINKJAR: 'FlinkJar',
FLINKSQLENV: 'FlinkSqlEnv',
SQL: 'Sql',
MYSQL: 'Mysql',
ORACLE: 'Oracle',
SQLSERVER: 'SqlServer',
POSTGRESQL: 'PostGreSql',
CLICKHOUSE: 'ClickHouse',
DORIS: 'Doris',
JAVA: 'Java',
};
export const CHART = {
LINE:'折线图',
BAR:'条形图',
PIE:'饼图',
LINE: '折线图',
BAR: '条形图',
PIE: '饼图',
};
export const isSql = (dialect: string)=>{
switch (dialect){
export const isSql = (dialect: string) => {
switch (dialect) {
case DIALECT.SQL:
case DIALECT.MYSQL:
case DIALECT.ORACLE:
......@@ -43,8 +43,54 @@ export const isSql = (dialect: string)=>{
}
};
export const isOnline = (type: string)=>{
switch (type){
export const isExecuteSql = (dialect: string) => {
if (!dialect) {
return true;
}
switch (dialect) {
case DIALECT.SQL:
case DIALECT.MYSQL:
case DIALECT.ORACLE:
case DIALECT.SQLSERVER:
case DIALECT.POSTGRESQL:
case DIALECT.CLICKHOUSE:
case DIALECT.DORIS:
case DIALECT.FLINKSQL:
return true;
default:
return false;
}
};
export const isTask = (dialect: string) => {
if (!dialect) {
return true;
}
switch (dialect) {
case DIALECT.SQL:
case DIALECT.MYSQL:
case DIALECT.ORACLE:
case DIALECT.SQLSERVER:
case DIALECT.POSTGRESQL:
case DIALECT.CLICKHOUSE:
case DIALECT.DORIS:
case DIALECT.FLINKSQL:
case DIALECT.FLINKJAR:
return true;
default:
return false;
}
};
export const isRunningTask = (jobInstanceId: number) => {
if (jobInstanceId && jobInstanceId != 0) {
return true;
}
return false;
};
export const isOnline = (type: string) => {
switch (type) {
case RUN_MODE.LOCAL:
case RUN_MODE.STANDALONE:
case RUN_MODE.YARN_SESSION:
......@@ -65,3 +111,9 @@ export const TASKSTEPS = {
CANCEL: 6,
};
export const isDeletedTask = (step: number) => {
if (step && step === TASKSTEPS.CANCEL) {
return true;
}
return false;
};
dlink-web/src/pages/Welcome.tsx
View file @ 53710e6e
......@@ -743,6 +743,9 @@ export default (): React.ReactNode => {
<li>
<Link>修复 用户未登录时后台报错及鉴权问题</Link>
</li>
<li>
<Link>新增 作业生命周期与任务实例同步联动</Link>
</li>
</ul>
</Paragraph>
</Timeline.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment