diff --git a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java index a5772bd9df..ef2e96e387 100644 --- a/dinky-admin/src/main/java/org/dinky/controller/TaskController.java +++ b/dinky-admin/src/main/java/org/dinky/controller/TaskController.java @@ -22,6 +22,7 @@ import org.dinky.data.annotation.Log; import org.dinky.data.annotations.ExecuteProcess; import org.dinky.data.annotations.ProcessId; +import org.dinky.data.dto.DebugDTO; import org.dinky.data.dto.TaskDTO; import org.dinky.data.dto.TaskRollbackVersionDTO; import org.dinky.data.enums.BusinessType; @@ -81,6 +82,20 @@ public Result submitTask(@ProcessId @RequestParam Integer id) throws } } + @PostMapping("/debugTask") + @ApiOperation("Debug Task") + @Log(title = "Debug Task", businessType = BusinessType.DEBUG) + @ApiImplicitParam( + name = "debugTask", + value = "Debug Task", + required = true, + dataType = "DebugDTO", + paramType = "body") + public Result debugTask(@RequestBody DebugDTO debugDTO) throws Exception { + JobResult result = taskService.debugTask(debugDTO); + return Result.succeed(result, Status.EXECUTE_SUCCESS); + } + @GetMapping("/cancel") @Log(title = "Cancel Flink Job", businessType = BusinessType.TRIGGER) @ApiOperation("Cancel Flink Job") diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/DebugDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/DebugDTO.java new file mode 100644 index 0000000000..fe6ff904ca --- /dev/null +++ b/dinky-admin/src/main/java/org/dinky/data/dto/DebugDTO.java @@ -0,0 +1,69 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dinky.data.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * Param for debug flink sql and common sql + */ +@Getter +@Setter +@ApiModel(value = "DebugDTO", description = "Param for debug flink sql and common sql") +public class DebugDTO { + + @ApiModelProperty( + value = "Task ID", + dataType = "Integer", + example = "1", + notes = "The ID of Task which is debugged") + private Integer id; + + @ApiModelProperty( + value = "Use Result", + dataType = "boolean", + example = "true", + notes = "Flag indicating whether to preview table result") + private boolean useResult = true; + + @ApiModelProperty( + value = "Use ChangeLog", + dataType = "boolean", + example = "false", + notes = "Flag indicating whether to preview change log") + private boolean useChangeLog = false; + + @ApiModelProperty( + value = "Use Auto Cancel", + dataType = "boolean", + example = "true", + notes = "Flag indicating whether to auto cancel after preview the maximum rows") + private boolean useAutoCancel = true; + + @ApiModelProperty( + value = "Max Row Number", + dataType = "Integer", + example = "1000", + notes = "The maximum number of rows to preview") + private Integer maxRowNum = 1000; +} diff --git a/dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java b/dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java index 4b4ceda736..1b09f8f933 100644 --- a/dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java +++ b/dinky-admin/src/main/java/org/dinky/data/enums/BusinessType.java @@ -36,6 +36,9 @@ public enum BusinessType { /** 提交 */ SUBMIT, + /** Debug */ + DEBUG, + /** 执行 */ EXECUTE, diff --git a/dinky-admin/src/main/java/org/dinky/service/TaskService.java b/dinky-admin/src/main/java/org/dinky/service/TaskService.java index 248a673e1f..21a2a60247 100644 --- a/dinky-admin/src/main/java/org/dinky/service/TaskService.java +++ b/dinky-admin/src/main/java/org/dinky/service/TaskService.java @@ -20,6 +20,7 @@ package org.dinky.service; import org.dinky.data.dto.AbstractStatementDTO; +import org.dinky.data.dto.DebugDTO; import org.dinky.data.dto.TaskDTO; import org.dinky.data.dto.TaskRollbackVersionDTO; import org.dinky.data.enums.JobLifeCycle; @@ -69,6 +70,15 @@ public interface TaskService extends ISuperService { */ JobResult submitTask(Integer id, String savePointPath) throws Exception; + /** + * Debug the given task and return the job result. + * + * @param debugDTO The param of preview task. + * @return A {@link JobResult} object representing the result of the submitted task. + * @throws ExcuteException If there is an error debugging the task. + */ + JobResult debugTask(DebugDTO debugDTO) throws Exception; + /** * Restart the given task and return the job result. * diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java index e7e992cf11..81bbf84b34 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java @@ -25,6 +25,7 @@ import org.dinky.data.annotations.ProcessStep; import org.dinky.data.constant.CommonConstant; import org.dinky.data.dto.AbstractStatementDTO; +import org.dinky.data.dto.DebugDTO; import org.dinky.data.dto.TaskDTO; import org.dinky.data.dto.TaskRollbackVersionDTO; import org.dinky.data.enums.JobLifeCycle; @@ -196,8 +197,7 @@ public void preCheckTask(TaskDTO task) throws TaskNotDoneException, SqlExplainEx @ProcessStep(type = ProcessStepType.SUBMIT_EXECUTE) public JobResult executeJob(TaskDTO task) throws Exception { - JobResult jobResult; - jobResult = BaseTask.getTask(task).execute(); + JobResult jobResult = BaseTask.getTask(task).execute(); log.info("execute job finished,status is {}", jobResult.getStatus()); return jobResult; } @@ -238,7 +238,7 @@ public String buildEnvSql(AbstractStatementDTO task) { task.setVariables(fragmentVariableService.listEnabledVariables()); } int envId = Optional.ofNullable(task.getEnvId()).orElse(-1); - if (envId >= 0) { + if (envId > 0) { TaskDTO envTask = this.getTaskInfoById(task.getEnvId()); if (Asserts.isNotNull(envTask) && Asserts.isNotNullString(envTask.getStatement())) { sql += envTask.getStatement() + CommonConstant.LineSep; @@ -279,6 +279,34 @@ public JobResult submitTask(Integer id, String savePointPath) throws Exception { return jobResult; } + @Override + @ProcessStep(type = ProcessStepType.SUBMIT_TASK) + public JobResult debugTask(DebugDTO debugDTO) throws Exception { + initTenantByTaskId(debugDTO.getId()); + + TaskDTO taskDTO = this.getTaskInfoById(debugDTO.getId()); + taskDTO.setUseResult(debugDTO.isUseResult()); + taskDTO.setUseChangeLog(debugDTO.isUseChangeLog()); + taskDTO.setUseAutoCancel(debugDTO.isUseAutoCancel()); + taskDTO.setMaxRowNum(debugDTO.getMaxRowNum()); + // 注解自调用会失效，这里通过获取对象方法绕过此限制 + TaskServiceImpl taskServiceBean = applicationContext.getBean(TaskServiceImpl.class); + taskServiceBean.preCheckTask(taskDTO); + + JobResult jobResult = taskServiceBean.executeJob(taskDTO); + + if (Job.JobStatus.SUCCESS == jobResult.getStatus()) { + log.info("Job debug success"); + Task task = new Task(debugDTO.getId(), jobResult.getJobInstanceId()); + if (!this.updateById(task)) { + throw new BusException(Status.TASK_UPDATE_FAILED.getMessage()); + } + } else { + log.error("Job debug failed, error: " + jobResult.getError()); + } + return jobResult; + } + @Override public JobResult restartTask(Integer id, String savePointPath) throws Exception { TaskDTO task = this.getTaskInfoById(id); diff --git a/dinky-common/src/main/java/org/dinky/data/enums/ProcessStepType.java b/dinky-common/src/main/java/org/dinky/data/enums/ProcessStepType.java index 1738ebca78..d1f0ab0b21 100644 --- a/dinky-common/src/main/java/org/dinky/data/enums/ProcessStepType.java +++ b/dinky-common/src/main/java/org/dinky/data/enums/ProcessStepType.java @@ -26,6 +26,7 @@ @Getter public enum ProcessStepType { SUBMIT_TASK("SUBMIT_TASK", Status.PROCESS_SUBMIT_SUBMITTASK), + SUBMIT_DEBUG("DEBUG_TASK", Status.PROCESS_SUBMIT_SUBMITTASK), SUBMIT_PRECHECK("SUBMIT_PRECHECK", Status.PROCESS_SUBMIT_CHECKSQL), SUBMIT_EXECUTE("SUBMIT_EXECUTE", Status.PROCESS_SUBMIT_EXECUTE), SUBMIT_BUILD_CONFIG("SUBMIT_BUILD_CONFIG", Status.PROCESS_SUBMIT_BUILDCONFIG), diff --git a/dinky-common/src/main/java/org/dinky/data/enums/Status.java b/dinky-common/src/main/java/org/dinky/data/enums/Status.java index dcc96bebe5..58a5d6612e 100644 --- a/dinky-common/src/main/java/org/dinky/data/enums/Status.java +++ b/dinky-common/src/main/java/org/dinky/data/enums/Status.java @@ -85,7 +85,8 @@ public enum Status { MOVE_FAILED(9028, "move.failed"), TEST_CONNECTION_SUCCESS(9029, "test.connection.success"), TEST_CONNECTION_FAILED(9030, "test.connection.failed"), - + DEBUG_SUCCESS(9031, "debug.success"), + DEBUG_FAILED(9032, "debug.failed"), /** * user,tenant,role */ diff --git a/dinky-common/src/main/resources/i18n/messages_en_US.properties b/dinky-common/src/main/resources/i18n/messages_en_US.properties index 670d35ebac..f8be5643b1 100644 --- a/dinky-common/src/main/resources/i18n/messages_en_US.properties +++ b/dinky-common/src/main/resources/i18n/messages_en_US.properties @@ -49,6 +49,8 @@ delete.failed=Delete Failed role.binding.user=Role Already Binding User , Can Not Delete not.token=Can Not Read Token execute.success=Execute Successfully +debug.success=Debug Successfully +debug.failed=Debug Failed token.freezed=token has been frozen menu.has.assign=Menu Has Assign , Can Not Delete datasource.status.refresh.success=DataSource Status Refresh Success diff --git a/dinky-common/src/main/resources/i18n/messages_zh_CN.properties b/dinky-common/src/main/resources/i18n/messages_zh_CN.properties index a747e28415..262c2afff7 100644 --- a/dinky-common/src/main/resources/i18n/messages_zh_CN.properties +++ b/dinky-common/src/main/resources/i18n/messages_zh_CN.properties @@ -49,6 +49,8 @@ delete.failed=删除失败 role.binding.user=该角色已绑定用户，无法删除 not.token=未能读取到有效 Token execute.success=执行成功 +debug.success=调试成功 +debug.failed=调试失败 token.freezed=token 已被冻结 menu.has.assign=菜单已分配,不允许删除 datasource.status.refresh.success=数据源状态刷新成功 diff --git a/dinky-core/src/main/java/org/dinky/data/result/AbstractResultBuilder.java b/dinky-core/src/main/java/org/dinky/data/result/AbstractResultBuilder.java new file mode 100644 index 0000000000..4d940c0c9a --- /dev/null +++ b/dinky-core/src/main/java/org/dinky/data/result/AbstractResultBuilder.java @@ -0,0 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.dinky.data.result; + +public abstract class AbstractResultBuilder { + protected String id; +} diff --git a/dinky-core/src/main/java/org/dinky/data/result/ResultBuilder.java b/dinky-core/src/main/java/org/dinky/data/result/ResultBuilder.java index 73fbbe647b..6178fa6be3 100644 --- a/dinky-core/src/main/java/org/dinky/data/result/ResultBuilder.java +++ b/dinky-core/src/main/java/org/dinky/data/result/ResultBuilder.java @@ -31,10 +31,15 @@ public interface ResultBuilder { static ResultBuilder build( - SqlType operationType, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) { + SqlType operationType, + String id, + Integer maxRowNum, + boolean isChangeLog, + boolean isAutoCancel, + String timeZone) { switch (operationType) { case SELECT: - return new SelectResultBuilder(maxRowNum, isChangeLog, isAutoCancel, timeZone); + return new SelectResultBuilder(id, maxRowNum, isChangeLog, isAutoCancel, timeZone); case SHOW: case DESC: case DESCRIBE: diff --git a/dinky-core/src/main/java/org/dinky/data/result/ResultRunnable.java b/dinky-core/src/main/java/org/dinky/data/result/ResultRunnable.java index b6d6da2bed..7b2b2c2417 100644 --- a/dinky-core/src/main/java/org/dinky/data/result/ResultRunnable.java +++ b/dinky-core/src/main/java/org/dinky/data/result/ResultRunnable.java @@ -49,14 +49,21 @@ public class ResultRunnable implements Runnable { private static final String nullColumn = ""; private final TableResult tableResult; + private final String id; private final Integer maxRowNum; private final boolean isChangeLog; private final boolean isAutoCancel; private final String timeZone; public ResultRunnable( - TableResult tableResult, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) { + TableResult tableResult, + String id, + Integer maxRowNum, + boolean isChangeLog, + boolean isAutoCancel, + String timeZone) { this.tableResult = tableResult; + this.id = id; this.maxRowNum = maxRowNum; this.isChangeLog = isChangeLog; this.isAutoCancel = isAutoCancel; @@ -67,16 +74,14 @@ public ResultRunnable( public void run() { try { tableResult.getJobClient().ifPresent(jobClient -> { - String jobId = jobClient.getJobID().toHexString(); - if (!ResultPool.containsKey(jobId)) { - ResultPool.put(new SelectResult(jobId, new ArrayList<>(), new LinkedHashSet<>())); + if (!ResultPool.containsKey(id)) { + ResultPool.put(new SelectResult(id, new ArrayList<>(), new LinkedHashSet<>())); } - try { if (isChangeLog) { - catchChangLog(ResultPool.get(jobId)); + catchChangLog(ResultPool.get(id)); } else { - catchData(ResultPool.get(jobId)); + catchData(ResultPool.get(id)); } } catch (Exception e) { log.error(String.format(e.toString())); diff --git a/dinky-core/src/main/java/org/dinky/data/result/SelectResultBuilder.java b/dinky-core/src/main/java/org/dinky/data/result/SelectResultBuilder.java index e121e5f06f..f7e3236375 100644 --- a/dinky-core/src/main/java/org/dinky/data/result/SelectResultBuilder.java +++ b/dinky-core/src/main/java/org/dinky/data/result/SelectResultBuilder.java @@ -28,14 +28,16 @@ * * @since 2021/5/25 16:03 */ -public class SelectResultBuilder implements ResultBuilder { +public class SelectResultBuilder extends AbstractResultBuilder implements ResultBuilder { private final Integer maxRowNum; private final boolean isChangeLog; private final boolean isAutoCancel; private final String timeZone; - public SelectResultBuilder(Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) { + public SelectResultBuilder( + String id, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) { + this.id = id; this.maxRowNum = Asserts.isNotNull(maxRowNum) ? maxRowNum : 100; this.isChangeLog = isChangeLog; this.isAutoCancel = isAutoCancel; @@ -46,7 +48,8 @@ public SelectResultBuilder(Integer maxRowNum, boolean isChangeLog, boolean isAut public IResult getResult(TableResult tableResult) { if (tableResult.getJobClient().isPresent()) { String jobId = tableResult.getJobClient().get().getJobID().toHexString(); - ResultRunnable runnable = new ResultRunnable(tableResult, maxRowNum, isChangeLog, isAutoCancel, timeZone); + ResultRunnable runnable = + new ResultRunnable(tableResult, id, maxRowNum, isChangeLog, isAutoCancel, timeZone); Thread thread = new Thread(runnable, jobId); thread.start(); return SelectResult.buildSuccess(jobId); diff --git a/dinky-core/src/main/java/org/dinky/job/Job.java b/dinky-core/src/main/java/org/dinky/job/Job.java index 5bbae5cdbb..9c97157af3 100644 --- a/dinky-core/src/main/java/org/dinky/job/Job.java +++ b/dinky-core/src/main/java/org/dinky/job/Job.java @@ -88,7 +88,12 @@ public static Job init( Executor executor, String statement, boolean useGateway) { - return new Job(jobConfig, type, JobStatus.INITIALIZE, statement, executorConfig, executor, useGateway); + Job job = new Job(jobConfig, type, JobStatus.INITIALIZE, statement, executorConfig, executor, useGateway); + if (!useGateway) { + job.setJobManagerAddress(executorConfig.getJobManagerAddress()); + } + JobContextHolder.setJob(job); + return job; } public JobResult getJobResult() { diff --git a/dinky-core/src/main/java/org/dinky/job/JobManager.java b/dinky-core/src/main/java/org/dinky/job/JobManager.java index ef72e208c7..94fdddfd00 100644 --- a/dinky-core/src/main/java/org/dinky/job/JobManager.java +++ b/dinky-core/src/main/java/org/dinky/job/JobManager.java @@ -340,10 +340,6 @@ public StreamGraph getJarStreamGraph(String statement) throws Exception { @ProcessStep(type = ProcessStepType.SUBMIT_EXECUTE) public JobResult executeJarSql(String statement) throws Exception { Job job = Job.init(runMode, config, executorConfig, executor, statement, useGateway); - if (!useGateway) { - job.setJobManagerAddress(executorConfig.getJobManagerAddress()); - } - JobContextHolder.setJob(job); StreamGraph streamGraph = getJarStreamGraph(statement); try { if (!useGateway) { @@ -392,10 +388,6 @@ public JobResult executeJarSql(String statement) throws Exception { @ProcessStep(type = ProcessStepType.SUBMIT_EXECUTE) public JobResult executeSql(String statement) throws Exception { Job job = Job.init(runMode, config, executorConfig, executor, statement, useGateway); - if (!useGateway) { - job.setJobManagerAddress(executorConfig.getJobManagerAddress()); - } - JobContextHolder.setJob(job); ready(); String currentSql = ""; DinkyClassLoaderUtil.initClassLoader(config); @@ -462,6 +454,7 @@ public JobResult executeSql(String statement) throws Exception { // Build insert result. IResult result = ResultBuilder.build( SqlType.INSERT, + job.getId().toString(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel(), @@ -498,6 +491,7 @@ public JobResult executeSql(String statement) throws Exception { if (config.isUseResult()) { IResult result = ResultBuilder.build( item.getType(), + job.getId().toString(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel(), @@ -524,6 +518,7 @@ public JobResult executeSql(String statement) throws Exception { if (config.isUseResult()) { IResult result = ResultBuilder.build( item.getType(), + job.getId().toString(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel(), @@ -591,6 +586,7 @@ public JobResult executeSql(String statement) throws Exception { if (config.isUseResult()) { IResult result = ResultBuilder.build( SqlType.EXECUTE, + job.getId().toString(), config.getMaxRowNum(), config.isUseChangeLog(), config.isUseAutoCancel(), @@ -676,7 +672,8 @@ public IResult executeDDL(String statement) { } LocalDateTime startTime = LocalDateTime.now(); TableResult tableResult = executor.executeSql(newStatement); - result = ResultBuilder.build(operationType, config.getMaxRowNum(), false, false, executor.getTimeZone()) + result = ResultBuilder.build( + operationType, null, config.getMaxRowNum(), false, false, executor.getTimeZone()) .getResult(tableResult); result.setStartTime(startTime); } @@ -757,7 +754,6 @@ public static GatewayResult deploySessionCluster(GatewayConfig gatewayConfig) { public JobResult executeJar() { // TODO 改为ProcessStep注释 Job job = Job.init(runMode, config, executorConfig, executor, null, useGateway); - JobContextHolder.setJob(job); ready(); try { GatewayResult gatewayResult = diff --git a/dinky-web/src/locales/en-US/pages.ts b/dinky-web/src/locales/en-US/pages.ts index 8f9fc4b0a6..b2c01e1a78 100644 --- a/dinky-web/src/locales/en-US/pages.ts +++ b/dinky-web/src/locales/en-US/pages.ts @@ -298,9 +298,12 @@ export default { * */ 'pages.datastudio.editor.check': 'Check current FlinkSql', + 'pages.datastudio.editor.debug': 'Debug', 'pages.datastudio.editor.exec': 'Execute', - 'pages.datastudio.editor.exec.error': 'Task [jobName}] execution failed', + 'pages.datastudio.editor.exec.error': 'Task [{jobName}] execution failed', + 'pages.datastudio.editor.debug.error': 'Task [{jobName}] debug failed', 'pages.datastudio.editor.exec.success': 'Execution succeeded', + 'pages.datastudio.editor.debug.success': 'Debug succeeded', 'pages.datastudio.editor.execute.warn': 'The execution mode of this task is [{type}], which does not support SQL query, please save it manually and use the button on the right - job submission', 'pages.datastudio.editor.explan': 'Get the current FlinkSql execution graph', @@ -309,6 +312,7 @@ export default { 'pages.datastudio.editor.stop.job': 'Stop job', 'pages.datastudio.editor.stop.jobConfirm': 'Are you sure to stop the job [{jobName}]? ', 'pages.datastudio.editor.submitting': 'The new task [{jobName}] is executing', + 'pages.datastudio.editor.debugging': 'The new task [{jobName}] is debugging', 'pages.datastudio.editor.onlyread': 'Task has been published, modification is prohibited, please go offline first', 'pages.datastudio.editor.notsave': 'Current changes are not saved! ', diff --git a/dinky-web/src/locales/zh-CN/pages.ts b/dinky-web/src/locales/zh-CN/pages.ts index cac67bda53..b48347c1ea 100644 --- a/dinky-web/src/locales/zh-CN/pages.ts +++ b/dinky-web/src/locales/zh-CN/pages.ts @@ -291,8 +291,11 @@ export default { * */ 'pages.datastudio.editor.check': '检查', + 'pages.datastudio.editor.debug': '调试', 'pages.datastudio.editor.exec': '运行', 'pages.datastudio.editor.exec.error': '任务【{jobName}】执行失败', + 'pages.datastudio.editor.debug.error': '任务【{jobName}】调试失败', + 'pages.datastudio.editor.debug.success': '调试成功', 'pages.datastudio.editor.exec.success': '执行成功', 'pages.datastudio.editor.execute.warn': '该任务执行模式为【{type}】，不支持 SQL 查询，请手动保存后使用右侧按钮——作业提交', @@ -302,6 +305,7 @@ export default { 'pages.datastudio.editor.stop.job': '停止作业', 'pages.datastudio.editor.stop.jobConfirm': '确定停止作业【{jobName}】吗？', 'pages.datastudio.editor.submitting': '新任务【{jobName}】正在执行', + 'pages.datastudio.editor.debugging': '新任务【{jobName}】正在调试', 'pages.datastudio.editor.onlyread': '任务已发布，禁止修改，请先下线任务', 'pages.datastudio.editor.notsave': '当前修改内容未保存！', 'pages.datastudio.editor.notsave.note': '继续将抛弃所修改内容，确定继续吗？', diff --git a/dinky-web/src/pages/DataStudio/BottomContainer/Result/index.tsx b/dinky-web/src/pages/DataStudio/BottomContainer/Result/index.tsx index 02069c6e84..0217194e03 100644 --- a/dinky-web/src/pages/DataStudio/BottomContainer/Result/index.tsx +++ b/dinky-web/src/pages/DataStudio/BottomContainer/Result/index.tsx @@ -141,6 +141,7 @@ const Result = (props: any) => { } } else { // flink sql + // to do: get job data by history id list, not flink jid if (current.jobInstanceId) { const res = await postAll(API_CONSTANTS.GET_JOB_BY_ID, { id: current.jobInstanceId diff --git a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx index 33887af2b1..85aec32d86 100644 --- a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx +++ b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx @@ -28,7 +28,7 @@ import { projectCommonShow } from '@/pages/DataStudio/HeaderContainer/function'; import { - cancelTask, + cancelTask, debugTask, executeSql, getJobPlan, onLineTask @@ -44,6 +44,7 @@ import { connect } from '@@/exports'; import { ApartmentOutlined, CaretRightFilled, + BugOutlined, EnvironmentOutlined, FundOutlined, MergeCellsOutlined, @@ -133,6 +134,26 @@ const HeaderContainer = (props: any) => { }); }; + const handlerDebug = async () => { + if (!currentData) return; + + const res = await debugTask( + l('pages.datastudio.editor.debugging', '', { jobName: currentData.name }), + currentData + ); + + if (!res) return; + updateJobRunningMsg({ + taskId: currentData.id, + jobName: currentData.name, + jobState: res.datas.status, + runningLog: res.msg + }); + messageApi.success(l('pages.datastudio.editor.debug.success')); + currentData.status = JOB_STATUS.RUNNING; + saveTabs({ ...props.tabs }); + }; + const handlerSubmit = async () => { if (!currentData) return; const saved = currentData.step == JOB_LIFE_CYCLE.ONLINE ? true : await handleSave(); @@ -148,7 +169,7 @@ const HeaderContainer = (props: any) => { taskId: currentData.id, jobName: currentData.name, jobState: res.datas.status, - runningLog: res.msg + runningLog: res.msg, }); messageApi.success(l('pages.datastudio.editor.exec.success')); currentData.status = JOB_STATUS.RUNNING; @@ -262,6 +283,19 @@ const HeaderContainer = (props: any) => { type: 'primary' } }, + { + // Debug button + icon: , + title: l('pages.datastudio.editor.debug'), + click: handlerDebug, + hotKey: (e: KeyboardEvent) => e.shiftKey && e.key === 'F9', + hotKeyDesc: 'Shift+F9', + isShow: currentTab?.type == TabsPageType.project && !isRunning(currentData), + props: { + style: { background: '#52c41a' }, + type: 'primary' + } + }, { // 停止按钮 icon: , diff --git a/dinky-web/src/pages/DataStudio/HeaderContainer/service.tsx b/dinky-web/src/pages/DataStudio/HeaderContainer/service.tsx index 90259c0026..2180b2ba65 100644 --- a/dinky-web/src/pages/DataStudio/HeaderContainer/service.tsx +++ b/dinky-web/src/pages/DataStudio/HeaderContainer/service.tsx @@ -29,6 +29,10 @@ export async function getJobPlan(title: string, params: any) { return handleOption('/api/task/getJobPlan', title, params); } +export async function debugTask(title: string, params: any) { + return postAll('/api/task/debugTask', params); +} + export async function executeSql(title: string, id: number) { return handleGetOption('/api/task/submitTask', title, { id }); }