From 877441519711c729951ba811f91cdb088d4f1e96 Mon Sep 17 00:00:00 2001 From: Wenjun Ruan Date: Wed, 10 Aug 2022 11:00:23 +0800 Subject: [PATCH] Split ExecutionStatus to WorkflowExecutionStatus and TaskExecutionStatus (#11340) --- .../alert/AlertSenderService.java | 45 +- .../alert/runner/AlertSenderServiceTest.java | 62 +- .../controller/ProcessInstanceController.java | 127 ++-- .../controller/TaskInstanceController.java | 30 +- .../api/dto/TaskCountDto.java | 30 +- .../api/dto/TaskStateCount.java | 57 +- .../api/service/ProcessInstanceService.java | 4 +- .../api/service/TaskInstanceService.java | 4 +- .../service/impl/DataAnalysisServiceImpl.java | 86 +-- .../api/service/impl/ExecutorServiceImpl.java | 193 +++--- .../impl/ProcessInstanceServiceImpl.java | 224 +++--- .../service/impl/TaskInstanceServiceImpl.java | 53 +- .../ProcessInstanceControllerTest.java | 63 +- .../TaskInstanceControllerTest.java | 8 +- .../api/service/DataAnalysisServiceTest.java | 75 +- .../api/service/ExecutorServiceTest.java | 75 +- .../service/ProcessInstanceServiceTest.java | 298 ++++---- .../api/service/TaskInstanceServiceTest.java | 120 ++-- .../dolphinscheduler/common/Constants.java | 61 +- .../common/enums/TaskStateType.java | 72 -- .../common/enums/WorkflowExecutionStatus.java | 134 ++++ .../common/utils/HadoopUtils.java | 87 ++- .../apache/dolphinscheduler/dao/AlertDao.java | 26 +- .../dao/entity/ExecuteStatusCount.java | 38 +- .../dao/entity/ProcessAlertContent.java | 215 +----- .../dao/entity/ProcessInstance.java | 447 +----------- .../dao/entity/TaskAlertContent.java | 110 +-- .../dao/entity/TaskInstance.java | 434 +----------- .../dao/mapper/ProcessInstanceMapper.java | 25 +- .../dao/mapper/TaskInstanceMapper.java | 12 +- .../dolphinscheduler/dao/utils/DagHelper.java | 58 +- .../dao/mapper/ProcessInstanceMapperTest.java | 80 ++- .../dao/mapper/TaskInstanceMapperTest.java | 47 +- .../dao/utils/DagHelperTest.java | 51 +- .../builder/TaskExecutionContextBuilder.java | 12 +- .../ProcessInstanceExecCacheManager.java | 4 +- .../consumer/TaskPriorityQueueConsumer.java | 2 +- .../server/master/event/StateEvent.java | 31 +- .../master/event/TaskDelayEventHandler.java | 24 +- .../event/TaskDispatchEventHandler.java | 14 +- .../event/TaskRejectByWorkerEventHandler.java | 20 +- .../master/event/TaskResultEventHandler.java | 32 +- .../event/TaskRetryStateEventHandler.java | 14 +- .../master/event/TaskRunningEventHandler.java | 30 +- .../server/master/event/TaskStateEvent.java | 52 ++ .../master/event/TaskStateEventHandler.java | 33 +- .../event/TaskTimeoutStateEventHandler.java | 24 +- .../event/WorkflowStartEventHandler.java | 36 +- .../master/event/WorkflowStateEvent.java | 48 ++ .../event/WorkflowStateEventHandler.java | 32 +- .../master/processor/StateEventProcessor.java | 58 +- .../master/processor/TaskEventProcessor.java | 30 +- .../queue/StateEventResponseService.java | 40 +- .../master/processor/queue/TaskEvent.java | 6 +- .../MasterConnectionStateListener.java | 10 +- .../master/registry/MasterRegistryClient.java | 13 +- .../runner/StateWheelExecuteThread.java | 143 ++-- .../runner/WorkflowExecuteRunnable.java | 530 +++++++------- .../runner/WorkflowExecuteThreadPool.java | 56 +- .../master/runner/task/BaseTaskProcessor.java | 75 +- .../runner/task/BlockingTaskProcessor.java | 46 +- .../runner/task/CommonTaskProcessor.java | 27 +- .../runner/task/ConditionTaskProcessor.java | 40 +- .../runner/task/DependentTaskProcessor.java | 17 +- .../master/runner/task/SubTaskProcessor.java | 59 +- .../runner/task/SwitchTaskProcessor.java | 33 +- .../master/service/MasterFailoverService.java | 51 +- .../master/service/WorkerFailoverService.java | 89 +-- .../utils/DataQualityResultOperator.java | 26 +- .../server/master/utils/DependentExecute.java | 45 +- .../server/master/BlockingTaskTest.java | 73 +- .../server/master/ConditionsTaskTest.java | 30 +- .../server/master/DependentTaskTest.java | 117 ++-- .../server/master/SubProcessTaskTest.java | 43 +- .../server/master/SwitchTaskTest.java | 17 +- .../TaskPriorityQueueConsumerTest.java | 24 +- .../processor/TaskAckProcessorTest.java | 33 +- .../TaskKillResponseProcessorTest.java | 15 +- .../queue/TaskResponseServiceTest.java | 24 +- .../runner/MasterTaskExecThreadTest.java | 42 +- .../runner/WorkflowExecuteRunnableTest.java | 23 +- .../runner/task/CommonTaskProcessorTest.java | 11 +- .../master/service/FailoverServiceTest.java | 43 +- .../remote/command/HostUpdateCommand.java | 25 +- .../command/StateEventResponseCommand.java | 39 +- .../command/TaskEventChangeCommand.java | 41 +- .../remote/command/TaskExecuteAckCommand.java | 7 +- .../command/TaskExecuteRunningAckMessage.java | 40 +- .../command/TaskExecuteRunningCommand.java | 4 +- .../command/TaskKillResponseCommand.java | 75 +- .../remote/command/TaskRejectAckCommand.java | 7 +- .../TaskStateEventResponseCommand.java | 32 +- ...a => WorkflowStateEventChangeCommand.java} | 76 +-- .../alert/AlertSendRequestCommand.java | 59 +- .../alert/AlertSendResponseCommand.java | 33 +- .../alert/AlertSendResponseResult.java | 33 +- .../log/GetLogBytesRequestCommand.java | 21 +- .../log/GetLogBytesResponseCommand.java | 21 +- .../log/RemoveTaskLogRequestCommand.java | 21 +- .../log/RemoveTaskLogResponseCommand.java | 25 +- .../log/RollViewLogRequestCommand.java | 39 +- .../log/RollViewLogResponseCommand.java | 21 +- .../command/log/ViewLogRequestCommand.java | 21 +- .../command/log/ViewLogResponseCommand.java | 21 +- .../remote/dto/TaskInstanceExecuteDto.java | 4 +- .../remote/dto/WorkflowExecuteDto.java | 10 +- .../alert/AlertSendResponseCommandTest.java | 8 +- .../log/GetLogBytesRequestCommandTest.java | 3 +- .../log/GetLogBytesResponseCommandTest.java | 3 +- .../server/utils/ProcessUtils.java | 34 +- .../server/utils/ProcessUtilsTest.java | 10 +- .../service/alert/ProcessAlertManager.java | 44 +- .../service/process/ProcessService.java | 25 +- .../service/process/ProcessServiceImpl.java | 645 ++++++++++-------- .../service/alert/AlertClientServiceTest.java | 84 +-- .../alert/ProcessAlertManagerTest.java | 9 +- .../plugin/task/api/AbstractTask.java | 13 +- .../plugin/task/api/TaskExecutionContext.java | 9 +- .../task/api/enums/ExecutionStatus.java | 206 ------ .../task/api/enums/TaskExecutionStatus.java | 126 ++++ .../plugin/task/api/model/DependentItem.java | 62 +- .../plugin/task/pigeon/PigeonTaskTest.java | 52 +- .../processor/TaskDispatchProcessor.java | 57 +- .../TaskExecuteResultAckProcessor.java | 21 +- .../TaskExecuteRunningAckProcessor.java | 9 +- .../worker/processor/TaskKillProcessor.java | 13 +- .../processor/TaskRejectAckProcessor.java | 18 +- .../worker/runner/TaskExecuteThread.java | 82 ++- .../processor/TaskDispatchProcessorTest.java | 56 +- 129 files changed, 3368 insertions(+), 4644 deletions(-) delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java create mode 100644 dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEvent.java create mode 100644 dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatusTest.java => dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskStateEventResponseCommand.java (54%) rename dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{StateEventChangeCommand.java => WorkflowStateEventChangeCommand.java} (51%) delete mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java index 798c717d59..9af74e668c 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertSenderService.java @@ -54,6 +54,7 @@ import com.google.common.collect.Lists; @Service public final class AlertSenderService extends Thread { + private static final Logger logger = LoggerFactory.getLogger(AlertSenderService.class); private final AlertDao alertDao; @@ -89,33 +90,36 @@ public final class AlertSenderService extends Thread { public void send(List alerts) { for (Alert alert : alerts) { - //get alert group from alert + // get alert group from alert int alertId = Optional.ofNullable(alert.getId()).orElse(0); int alertGroupId = Optional.ofNullable(alert.getAlertGroupId()).orElse(0); List alertInstanceList = alertDao.listInstanceByAlertGroupId(alertGroupId); if (CollectionUtils.isEmpty(alertInstanceList)) { logger.error("send alert msg fail,no bind plugin instance."); List alertResults = Lists.newArrayList(new AlertResult("false", - "no bind plugin instance")); + "no bind plugin instance")); alertDao.updateAlert(AlertStatus.EXECUTION_FAILURE, JSONUtils.toJsonString(alertResults), alertId); continue; } AlertData alertData = AlertData.builder() - .id(alertId) - .content(alert.getContent()) - .log(alert.getLog()) - .title(alert.getTitle()) - .warnType(alert.getWarningType().getCode()) - .alertType(alert.getAlertType().getCode()) - .build(); + .id(alertId) + .content(alert.getContent()) + .log(alert.getLog()) + .title(alert.getTitle()) + .warnType(alert.getWarningType().getCode()) + .alertType(alert.getAlertType().getCode()) + .build(); int sendSuccessCount = 0; List alertResults = new ArrayList<>(); for (AlertPluginInstance instance : alertInstanceList) { AlertResult alertResult = this.alertResultHandler(instance, alertData); if (alertResult != null) { - AlertStatus sendStatus = Boolean.parseBoolean(String.valueOf(alertResult.getStatus())) ? AlertStatus.EXECUTION_SUCCESS : AlertStatus.EXECUTION_FAILURE; - alertDao.addAlertSendStatus(sendStatus, JSONUtils.toJsonString(alertResult), alertId, instance.getId()); + AlertStatus sendStatus = Boolean.parseBoolean(String.valueOf(alertResult.getStatus())) + ? AlertStatus.EXECUTION_SUCCESS + : AlertStatus.EXECUTION_FAILURE; + alertDao.addAlertSendStatus(sendStatus, JSONUtils.toJsonString(alertResult), alertId, + instance.getId()); if (sendStatus.equals(AlertStatus.EXECUTION_SUCCESS)) { sendSuccessCount++; AlertServerMetrics.incAlertSuccessCount(); @@ -157,7 +161,7 @@ public final class AlertSenderService extends Thread { if (CollectionUtils.isEmpty(alertInstanceList)) { AlertSendResponseResult alertSendResponseResult = new AlertSendResponseResult(); String message = String.format("Alert GroupId %s send error : not found alert instance", alertGroupId); - alertSendResponseResult.setStatus(false); + alertSendResponseResult.setSuccess(false); alertSendResponseResult.setMessage(message); sendResponseResults.add(alertSendResponseResult); logger.error("Alert GroupId {} send error : not found alert instance", alertGroupId); @@ -169,7 +173,7 @@ public final class AlertSenderService extends Thread { if (alertResult != null) { AlertSendResponseResult alertSendResponseResult = new AlertSendResponseResult( Boolean.parseBoolean(String.valueOf(alertResult.getStatus())), alertResult.getMessage()); - sendResponseStatus = sendResponseStatus && alertSendResponseResult.getStatus(); + sendResponseStatus = sendResponseStatus && alertSendResponseResult.isSuccess(); sendResponseResults.add(alertSendResponseResult); } } @@ -190,8 +194,8 @@ public final class AlertSenderService extends Thread { Optional alertChannelOptional = alertPluginManager.getAlertChannel(instance.getPluginDefineId()); if (!alertChannelOptional.isPresent()) { String message = String.format("Alert Plugin %s send error: the channel doesn't exist, pluginDefineId: %s", - pluginInstanceName, - pluginDefineId); + pluginInstanceName, + pluginDefineId); logger.error("Alert Plugin {} send error : not found plugin {}", pluginInstanceName, pluginDefineId); return new AlertResult("false", message); } @@ -231,16 +235,17 @@ public final class AlertSenderService extends Thread { } if (!sendWarning) { - logger.info("Alert Plugin {} send ignore warning type not match: plugin warning type is {}, alert data warning type is {}", + logger.info( + "Alert Plugin {} send ignore warning type not match: plugin warning type is {}, alert data warning type is {}", pluginInstanceName, warningType.getCode(), alertData.getWarnType()); return null; } AlertInfo alertInfo = AlertInfo.builder() - .alertData(alertData) - .alertParams(paramsMap) - .alertPluginInstanceId(instance.getId()) - .build(); + .alertData(alertData) + .alertParams(paramsMap) + .alertPluginInstanceId(instance.getId()) + .build(); int waitTimeout = alertConfig.getWaitTimeout(); try { AlertResult alertResult; diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java index cdc2f83443..3e38721fba 100644 --- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java +++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/AlertSenderServiceTest.java @@ -48,6 +48,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class AlertSenderServiceTest { + private static final Logger logger = LoggerFactory.getLogger(AlertSenderServiceTest.class); @Mock @@ -74,22 +75,23 @@ public class AlertSenderServiceTest { String title = "alert mail test title"; String content = "alert mail test content"; - //1.alert instance does not exist + // 1.alert instance does not exist when(alertDao.listInstanceByAlertGroupId(alertGroupId)).thenReturn(null); when(alertConfig.getWaitTimeout()).thenReturn(0); - AlertSendResponseCommand alertSendResponseCommand = alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage())); + AlertSendResponseCommand alertSendResponseCommand = + alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //2.alert plugin does not exist + // 2.alert plugin does not exist int pluginDefineId = 1; String pluginInstanceParams = "alert-instance-mail-params"; String pluginInstanceName = "alert-instance-mail"; List alertInstanceList = new ArrayList<>(); AlertPluginInstance alertPluginInstance = new AlertPluginInstance( - pluginDefineId, pluginInstanceParams, pluginInstanceName); + pluginDefineId, pluginInstanceParams, pluginInstanceName); alertInstanceList.add(alertPluginInstance); when(alertDao.listInstanceByAlertGroupId(1)).thenReturn(alertInstanceList); @@ -97,35 +99,38 @@ public class AlertSenderServiceTest { PluginDefine pluginDefine = new PluginDefine(pluginName, "1", null); when(pluginDao.getPluginDefineById(pluginDefineId)).thenReturn(pluginDefine); - alertSendResponseCommand = alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage())); + alertSendResponseCommand = + alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //3.alert result value is null + // 3.alert result value is null AlertChannel alertChannelMock = mock(AlertChannel.class); when(alertChannelMock.process(Mockito.any())).thenReturn(null); when(alertPluginManager.getAlertChannel(1)).thenReturn(Optional.of(alertChannelMock)); when(alertConfig.getWaitTimeout()).thenReturn(0); - alertSendResponseCommand = alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage())); + alertSendResponseCommand = + alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //4.abnormal information inside the alert plug-in code + // 4.abnormal information inside the alert plug-in code AlertResult alertResult = new AlertResult(); alertResult.setStatus(String.valueOf(false)); alertResult.setMessage("Abnormal information inside the alert plug-in code"); when(alertChannelMock.process(Mockito.any())).thenReturn(alertResult); when(alertPluginManager.getAlertChannel(1)).thenReturn(Optional.of(alertChannelMock)); - alertSendResponseCommand = alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage())); + alertSendResponseCommand = + alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //5.alert plugin send success + // 5.alert plugin send success alertResult = new AlertResult(); alertResult.setStatus(String.valueOf(true)); alertResult.setMessage(String.format("Alert Plugin %s send success", pluginInstanceName)); @@ -133,10 +138,11 @@ public class AlertSenderServiceTest { when(alertPluginManager.getAlertChannel(1)).thenReturn(Optional.of(alertChannelMock)); when(alertConfig.getWaitTimeout()).thenReturn(5000); - alertSendResponseCommand = alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); - Assert.assertTrue(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}", result.getStatus(), result.getMessage())); + alertSendResponseCommand = + alertSenderService.syncHandler(alertGroupId, title, content, WarningType.ALL.getCode()); + Assert.assertTrue(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); } @@ -153,14 +159,14 @@ public class AlertSenderServiceTest { alert.setWarningType(WarningType.FAILURE); alertList.add(alert); -// alertSenderService = new AlertSenderService(); + // alertSenderService = new AlertSenderService(); int pluginDefineId = 1; String pluginInstanceParams = "alert-instance-mail-params"; String pluginInstanceName = "alert-instance-mail"; List alertInstanceList = new ArrayList<>(); AlertPluginInstance alertPluginInstance = new AlertPluginInstance( - pluginDefineId, pluginInstanceParams, pluginInstanceName); + pluginDefineId, pluginInstanceParams, pluginInstanceName); alertInstanceList.add(alertPluginInstance); when(alertDao.listInstanceByAlertGroupId(alertGroupId)).thenReturn(alertInstanceList); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java index 90711242f1..a5ccd5b329 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java @@ -17,29 +17,24 @@ package org.apache.dolphinscheduler.api.controller; -import static org.apache.dolphinscheduler.api.enums.Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_BY_ID_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR; -import static org.apache.dolphinscheduler.api.enums.Status.UPDATE_PROCESS_INSTANCE_ERROR; - +import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation; import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.exceptions.ApiException; import org.apache.dolphinscheduler.api.service.ProcessInstanceService; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.ParameterUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; - -import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; import java.io.IOException; import java.text.MessageFormat; @@ -48,27 +43,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import springfox.documentation.annotations.ApiIgnore; +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * process instance controller @@ -81,7 +56,7 @@ public class ProcessInstanceController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(ProcessInstanceController.class); @Autowired - ProcessInstanceService processInstanceService; + private ProcessInstanceService processInstanceService; /** * query process instance list paging @@ -101,15 +76,15 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "queryProcessInstanceListPaging", notes = "QUERY_PROCESS_INSTANCE_LIST_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "processDefineCode", value = "PROCESS_DEFINITION_CODE", dataType = "Long", example = "100"), - @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", type = "String"), - @ApiImplicitParam(name = "executorName", value = "EXECUTOR_NAME", type = "String"), - @ApiImplicitParam(name = "stateType", value = "EXECUTION_STATUS", type = "ExecutionStatus"), - @ApiImplicitParam(name = "host", value = "HOST", type = "String"), - @ApiImplicitParam(name = "startDate", value = "START_DATE", type = "String"), - @ApiImplicitParam(name = "endDate", value = "END_DATE", type = "String"), - @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"), - @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "10") + @ApiImplicitParam(name = "processDefineCode", value = "PROCESS_DEFINITION_CODE", dataType = "Long", example = "100"), + @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", type = "String"), + @ApiImplicitParam(name = "executorName", value = "EXECUTOR_NAME", type = "String"), + @ApiImplicitParam(name = "stateType", value = "EXECUTION_STATUS", type = "ExecutionStatus"), + @ApiImplicitParam(name = "host", value = "HOST", type = "String"), + @ApiImplicitParam(name = "startDate", value = "START_DATE", type = "String"), + @ApiImplicitParam(name = "endDate", value = "END_DATE", type = "String"), + @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"), + @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "10") }) @GetMapping() @ResponseStatus(HttpStatus.OK) @@ -120,7 +95,7 @@ public class ProcessInstanceController extends BaseController { @RequestParam(value = "processDefineCode", required = false, defaultValue = "0") long processDefineCode, @RequestParam(value = "searchVal", required = false) String searchVal, @RequestParam(value = "executorName", required = false) String executorName, - @RequestParam(value = "stateType", required = false) ExecutionStatus stateType, + @RequestParam(value = "stateType", required = false) WorkflowExecutionStatus stateType, @RequestParam(value = "host", required = false) String host, @RequestParam(value = "startDate", required = false) String startTime, @RequestParam(value = "endDate", required = false) String endTime, @@ -133,7 +108,8 @@ public class ProcessInstanceController extends BaseController { return result; } searchVal = ParameterUtils.handleEscapes(searchVal); - result = processInstanceService.queryProcessInstanceList(loginUser, projectCode, processDefineCode, startTime, endTime, + result = processInstanceService.queryProcessInstanceList(loginUser, projectCode, processDefineCode, startTime, + endTime, searchVal, executorName, stateType, host, otherParamsJson, pageNo, pageSize); return result; } @@ -148,7 +124,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "queryTaskListByProcessId", notes = "QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @GetMapping(value = "/{id}/tasks") @ResponseStatus(HttpStatus.OK) @@ -177,15 +153,15 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "updateProcessInstance", notes = "UPDATE_PROCESS_INSTANCE_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "taskRelationJson", value = "TASK_RELATION_JSON", type = "String"), - @ApiImplicitParam(name = "taskDefinitionJson", value = "TASK_DEFINITION_JSON", type = "String"), - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "1"), - @ApiImplicitParam(name = "scheduleTime", value = "SCHEDULE_TIME", type = "String"), - @ApiImplicitParam(name = "syncDefine", value = "SYNC_DEFINE", required = true, type = "Boolean", example = "false"), - @ApiImplicitParam(name = "globalParams", value = "PROCESS_GLOBAL_PARAMS", type = "String", example = "[]"), - @ApiImplicitParam(name = "locations", value = "PROCESS_INSTANCE_LOCATIONS", type = "String"), - @ApiImplicitParam(name = "timeout", value = "PROCESS_TIMEOUT", type = "Int", example = "0"), - @ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE", type = "String", example = "default") + @ApiImplicitParam(name = "taskRelationJson", value = "TASK_RELATION_JSON", type = "String"), + @ApiImplicitParam(name = "taskDefinitionJson", value = "TASK_DEFINITION_JSON", type = "String"), + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "1"), + @ApiImplicitParam(name = "scheduleTime", value = "SCHEDULE_TIME", type = "String"), + @ApiImplicitParam(name = "syncDefine", value = "SYNC_DEFINE", required = true, type = "Boolean", example = "false"), + @ApiImplicitParam(name = "globalParams", value = "PROCESS_GLOBAL_PARAMS", type = "String", example = "[]"), + @ApiImplicitParam(name = "locations", value = "PROCESS_INSTANCE_LOCATIONS", type = "String"), + @ApiImplicitParam(name = "timeout", value = "PROCESS_TIMEOUT", type = "Int", example = "0"), + @ApiImplicitParam(name = "tenantCode", value = "TENANT_CODE", type = "String", example = "default") }) @PutMapping(value = "/{id}") @ResponseStatus(HttpStatus.OK) @@ -203,7 +179,8 @@ public class ProcessInstanceController extends BaseController { @RequestParam(value = "timeout", required = false, defaultValue = "0") int timeout, @RequestParam(value = "tenantCode", required = true) String tenantCode) { Map result = processInstanceService.updateProcessInstance(loginUser, projectCode, id, - taskRelationJson, taskDefinitionJson, scheduleTime, syncDefine, globalParams, locations, timeout, tenantCode); + taskRelationJson, taskDefinitionJson, scheduleTime, syncDefine, globalParams, locations, timeout, + tenantCode); return returnDataList(result); } @@ -217,7 +194,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "queryProcessInstanceById", notes = "QUERY_PROCESS_INSTANCE_BY_ID_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @GetMapping(value = "/{id}") @ResponseStatus(HttpStatus.OK) @@ -242,9 +219,9 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "queryTopNLongestRunningProcessInstance", notes = "QUERY_TOPN_LONGEST_RUNNING_PROCESS_INSTANCE_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "size", value = "PROCESS_INSTANCE_SIZE", required = true, dataType = "Int", example = "10"), - @ApiImplicitParam(name = "startTime", value = "PROCESS_INSTANCE_START_TIME", required = true, dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "PROCESS_INSTANCE_END_TIME", required = true, dataType = "String"), + @ApiImplicitParam(name = "size", value = "PROCESS_INSTANCE_SIZE", required = true, dataType = "Int", example = "10"), + @ApiImplicitParam(name = "startTime", value = "PROCESS_INSTANCE_START_TIME", required = true, dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "PROCESS_INSTANCE_END_TIME", required = true, dataType = "String"), }) @GetMapping(value = "/top-n") @ResponseStatus(HttpStatus.OK) @@ -255,7 +232,8 @@ public class ProcessInstanceController extends BaseController { @RequestParam("size") Integer size, @RequestParam(value = "startTime", required = true) String startTime, @RequestParam(value = "endTime", required = true) String endTime) { - Map result = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, endTime); + Map result = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser, + projectCode, size, startTime, endTime); return returnDataList(result); } @@ -270,7 +248,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "deleteProcessInstanceById", notes = "DELETE_PROCESS_INSTANCE_BY_ID_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @DeleteMapping(value = "/{id}") @ResponseStatus(HttpStatus.OK) @@ -293,7 +271,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "querySubProcessInstanceByTaskCode", notes = "QUERY_SUBPROCESS_INSTANCE_BY_TASK_CODE_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "taskCode", value = "TASK_CODE", required = true, dataType = "Long", example = "100") + @ApiImplicitParam(name = "taskCode", value = "TASK_CODE", required = true, dataType = "Long", example = "100") }) @GetMapping(value = "/query-sub-by-parent") @ResponseStatus(HttpStatus.OK) @@ -302,7 +280,8 @@ public class ProcessInstanceController extends BaseController { public Result querySubProcessInstanceByTaskId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode, @RequestParam("taskId") Integer taskId) { - Map result = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, taskId); + Map result = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, taskId); return returnDataList(result); } @@ -316,7 +295,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "queryParentInstanceBySubId", notes = "QUERY_PARENT_PROCESS_INSTANCE_BY_SUB_PROCESS_INSTANCE_ID_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "subId", value = "SUB_PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "subId", value = "SUB_PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @GetMapping(value = "/query-parent-by-sub") @ResponseStatus(HttpStatus.OK) @@ -338,7 +317,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "viewVariables", notes = "QUERY_PROCESS_INSTANCE_GLOBAL_VARIABLES_AND_LOCAL_VARIABLES_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @GetMapping(value = "/{id}/view-variables") @ResponseStatus(HttpStatus.OK) @@ -361,7 +340,7 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "vieGanttTree", notes = "VIEW_GANTT_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") + @ApiImplicitParam(name = "id", value = "PROCESS_INSTANCE_ID", required = true, dataType = "Int", example = "100") }) @GetMapping(value = "/{id}/view-gantt") @ResponseStatus(HttpStatus.OK) @@ -385,8 +364,8 @@ public class ProcessInstanceController extends BaseController { */ @ApiOperation(value = "batchDeleteProcessInstanceByIds", notes = "BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "projectCode", value = "PROJECT_CODE", required = true, dataType = "Int"), - @ApiImplicitParam(name = "processInstanceIds", value = "PROCESS_INSTANCE_IDS", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectCode", value = "PROJECT_CODE", required = true, dataType = "Int"), + @ApiImplicitParam(name = "processInstanceIds", value = "PROCESS_INSTANCE_IDS", required = true, dataType = "String"), }) @PostMapping(value = "/batch-delete") @ResponseStatus(HttpStatus.OK) @@ -404,13 +383,15 @@ public class ProcessInstanceController extends BaseController { for (String strProcessInstanceId : processInstanceIdArray) { int processInstanceId = Integer.parseInt(strProcessInstanceId); try { - Map deleteResult = processInstanceService.deleteProcessInstanceById(loginUser, projectCode, processInstanceId); + Map deleteResult = + processInstanceService.deleteProcessInstanceById(loginUser, projectCode, processInstanceId); if (!Status.SUCCESS.equals(deleteResult.get(Constants.STATUS))) { deleteFailedIdList.add((String) deleteResult.get(Constants.MSG)); logger.error((String) deleteResult.get(Constants.MSG)); } } catch (Exception e) { - deleteFailedIdList.add(MessageFormat.format(Status.PROCESS_INSTANCE_ERROR.getMsg(), strProcessInstanceId)); + deleteFailedIdList + .add(MessageFormat.format(Status.PROCESS_INSTANCE_ERROR.getMsg(), strProcessInstanceId)); } } } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java index e007c55807..411fd417e6 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java @@ -27,10 +27,10 @@ import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.utils.ParameterUtils; import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Map; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; @@ -58,7 +58,7 @@ import springfox.documentation.annotations.ApiIgnore; public class TaskInstanceController extends BaseController { @Autowired - TaskInstanceService taskInstanceService; + private TaskInstanceService taskInstanceService; /** * query task list paging @@ -78,17 +78,17 @@ public class TaskInstanceController extends BaseController { */ @ApiOperation(value = "queryTaskListPaging", notes = "QUERY_TASK_INSTANCE_LIST_PAGING_NOTES") @ApiImplicitParams({ - @ApiImplicitParam(name = "processInstanceId", value = "PROCESS_INSTANCE_ID", required = false, dataType = "Int", example = "100"), - @ApiImplicitParam(name = "processInstanceName", value = "PROCESS_INSTANCE_NAME", required = false, type = "String"), - @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", type = "String"), - @ApiImplicitParam(name = "taskName", value = "TASK_NAME", type = "String"), - @ApiImplicitParam(name = "executorName", value = "EXECUTOR_NAME", type = "String"), - @ApiImplicitParam(name = "stateType", value = "EXECUTION_STATUS", type = "ExecutionStatus"), - @ApiImplicitParam(name = "host", value = "HOST", type = "String"), - @ApiImplicitParam(name = "startDate", value = "START_DATE", type = "String"), - @ApiImplicitParam(name = "endDate", value = "END_DATE", type = "String"), - @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"), - @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20") + @ApiImplicitParam(name = "processInstanceId", value = "PROCESS_INSTANCE_ID", required = false, dataType = "Int", example = "100"), + @ApiImplicitParam(name = "processInstanceName", value = "PROCESS_INSTANCE_NAME", required = false, type = "String"), + @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", type = "String"), + @ApiImplicitParam(name = "taskName", value = "TASK_NAME", type = "String"), + @ApiImplicitParam(name = "executorName", value = "EXECUTOR_NAME", type = "String"), + @ApiImplicitParam(name = "stateType", value = "EXECUTION_STATUS", type = "ExecutionStatus"), + @ApiImplicitParam(name = "host", value = "HOST", type = "String"), + @ApiImplicitParam(name = "startDate", value = "START_DATE", type = "String"), + @ApiImplicitParam(name = "endDate", value = "END_DATE", type = "String"), + @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"), + @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20") }) @GetMapping() @ResponseStatus(HttpStatus.OK) @@ -101,7 +101,7 @@ public class TaskInstanceController extends BaseController { @RequestParam(value = "searchVal", required = false) String searchVal, @RequestParam(value = "taskName", required = false) String taskName, @RequestParam(value = "executorName", required = false) String executorName, - @RequestParam(value = "stateType", required = false) ExecutionStatus stateType, + @RequestParam(value = "stateType", required = false) TaskExecutionStatus stateType, @RequestParam(value = "host", required = false) String host, @RequestParam(value = "startDate", required = false) String startTime, @RequestParam(value = "endDate", required = false) String endTime, @@ -127,7 +127,7 @@ public class TaskInstanceController extends BaseController { */ @ApiOperation(value = "force-success", notes = "FORCE_TASK_SUCCESS") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "TASK_INSTANCE_ID", required = true, dataType = "Int", example = "12") + @ApiImplicitParam(name = "id", value = "TASK_INSTANCE_ID", required = true, dataType = "Int", example = "12") }) @PostMapping(value = "/{id}/force-success") @ResponseStatus(HttpStatus.OK) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java index 96082aab45..6a7d78fc4a 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java @@ -17,17 +17,16 @@ package org.apache.dolphinscheduler.api.dto; +import lombok.Data; import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * task count dto - */ +@Data public class TaskCountDto { /** @@ -45,10 +44,10 @@ public class TaskCountDto { } private void countTaskDtos(List taskInstanceStateCounts) { - Map statusCountMap = taskInstanceStateCounts.stream() - .collect(Collectors.toMap(ExecuteStatusCount::getExecutionStatus, ExecuteStatusCount::getCount, Integer::sum)); + Map statusCountMap = taskInstanceStateCounts.stream() + .collect(Collectors.toMap(ExecuteStatusCount::getState, ExecuteStatusCount::getCount, Integer::sum)); - taskCountDtos = Arrays.stream(ExecutionStatus.values()) + taskCountDtos = Arrays.stream(TaskExecutionStatus.values()) .map(status -> new TaskStateCount(status, statusCountMap.getOrDefault(status, 0))) .collect(Collectors.toList()); @@ -58,7 +57,7 @@ public class TaskCountDto { } // remove the specified state - public void removeStateFromCountList(ExecutionStatus status) { + public void removeStateFromCountList(TaskExecutionStatus status) { for (TaskStateCount count : this.taskCountDtos) { if (count.getTaskStateType().equals(status)) { this.taskCountDtos.remove(count); @@ -67,19 +66,4 @@ public class TaskCountDto { } } - public List getTaskCountDtos() { - return taskCountDtos; - } - - public void setTaskCountDtos(List taskCountDtos) { - this.taskCountDtos = taskCountDtos; - } - - public int getTotalCount() { - return totalCount; - } - - public void setTotalCount(int totalCount) { - this.totalCount = totalCount; - } } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java index 2fe5e9ec23..95dc18a49f 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java @@ -17,58 +17,17 @@ package org.apache.dolphinscheduler.api.dto; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; -/** - * task state count - */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class TaskStateCount { + private TaskExecutionStatus taskStateType; private int count; - private ExecutionStatus taskStateType; - public TaskStateCount(ExecutionStatus taskStateType, int count) { - this.taskStateType = taskStateType; - this.count = count; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public ExecutionStatus getTaskStateType() { - return taskStateType; - } - - public void setTaskStateType(ExecutionStatus taskStateType) { - this.taskStateType = taskStateType; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - TaskStateCount that = (TaskStateCount) o; - - if (count != that.count) { - return false; - } - return taskStateType == that.taskStateType; - } - - @Override - public int hashCode() { - int result = count; - result = 31 * result + (taskStateType != null ? taskStateType.hashCode() : 0); - return result; - } } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java index 73a5b35ff6..ca03353740 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.User; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; /** * process instance service @@ -78,7 +78,7 @@ public interface ProcessInstanceService { String endDate, String searchVal, String executorName, - ExecutionStatus stateType, + WorkflowExecutionStatus stateType, String host, String otherParamsJson, Integer pageNo, diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java index 0d16022799..f532b7d046 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java @@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.api.service; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import java.util.Map; @@ -53,7 +53,7 @@ public interface TaskInstanceService { String startDate, String endDate, String searchVal, - ExecutionStatus stateType, + TaskExecutionStatus stateType, String host, Integer pageNo, Integer pageSize); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java index c914bcd3d0..c7222c2a0d 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java @@ -19,14 +19,12 @@ package org.apache.dolphinscheduler.api.service.impl; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant; import org.apache.dolphinscheduler.api.dto.CommandStateCount; import org.apache.dolphinscheduler.api.dto.DefineUserDto; import org.apache.dolphinscheduler.api.dto.TaskCountDto; import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.service.DataAnalysisService; import org.apache.dolphinscheduler.api.service.ProjectService; -import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.AuthorizationType; import org.apache.dolphinscheduler.common.enums.CommandType; @@ -44,7 +42,7 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.service.process.ProcessService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,11 +51,8 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -109,7 +104,8 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal * @return task state count data */ @Override - public Map countTaskStateByProject(User loginUser, long projectCode, String startDate, String endDate) { + public Map countTaskStateByProject(User loginUser, long projectCode, String startDate, + String endDate) { return countStateByProject( loginUser, @@ -129,17 +125,20 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal * @return process instance state count data */ @Override - public Map countProcessInstanceStateByProject(User loginUser, long projectCode, String startDate, String endDate) { + public Map countProcessInstanceStateByProject(User loginUser, long projectCode, String startDate, + String endDate) { Map result = this.countStateByProject( loginUser, projectCode, startDate, endDate, - (start, end, projectCodes) -> this.processInstanceMapper.countInstanceStateByProjectCodes(start, end, projectCodes)); + (start, end, projectCodes) -> this.processInstanceMapper.countInstanceStateByProjectCodes(start, end, + projectCodes)); // process state count needs to remove state of forced success if (result.containsKey(Constants.STATUS) && result.get(Constants.STATUS).equals(Status.SUCCESS)) { - ((TaskCountDto) result.get(Constants.DATA_LIST)).removeStateFromCountList(ExecutionStatus.FORCED_SUCCESS); + ((TaskCountDto) result.get(Constants.DATA_LIST)) + .removeStateFromCountList(TaskExecutionStatus.FORCED_SUCCESS); } return result; } @@ -152,12 +151,12 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal * @param startDate start date * @param endDate end date */ - private Map countStateByProject(User loginUser, long projectCode, String startDate, String endDate - , TriFunction> instanceStateCounter) { + private Map countStateByProject(User loginUser, long projectCode, String startDate, String endDate, + TriFunction> instanceStateCounter) { Map result = new HashMap<>(); if (projectCode != 0) { Project project = projectMapper.queryByCode(projectCode); - result = projectService.checkProjectAndAuth(loginUser, project, projectCode,PROJECT_OVERVIEW); + result = projectService.checkProjectAndAuth(loginUser, project, projectCode, PROJECT_OVERVIEW); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -177,7 +176,8 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal if (projectIds.getRight() != null) { return projectIds.getRight(); } - Long[] projectCodeArray = projectCode == 0 ? getProjectCodesArrays(projectIds.getLeft()) : new Long[]{projectCode}; + Long[] projectCodeArray = + projectCode == 0 ? getProjectCodesArrays(projectIds.getLeft()) : new Long[]{projectCode}; List processInstanceStateCounts = new ArrayList<>(); if (projectCodeArray.length != 0 || loginUser.getUserType() == UserType.ADMIN_USER) { @@ -192,7 +192,6 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal return result; } - /** * statistics the process definition quantities of a certain person *

@@ -207,7 +206,7 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal Map result = new HashMap<>(); if (projectCode != 0) { Project project = projectMapper.queryByCode(projectCode); - result = projectService.checkProjectAndAuth(loginUser, project, projectCode,PROJECT_OVERVIEW); + result = projectService.checkProjectAndAuth(loginUser, project, projectCode, PROJECT_OVERVIEW); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -222,7 +221,8 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal putMsg(result, Status.SUCCESS); return result; } - Long[] projectCodeArray = projectCode == 0 ? getProjectCodesArrays(projectIds.getLeft()) : new Long[]{projectCode}; + Long[] projectCodeArray = + projectCode == 0 ? getProjectCodesArrays(projectIds.getLeft()) : new Long[]{projectCode}; if (projectCodeArray.length != 0 || loginUser.getUserType() == UserType.ADMIN_USER) { defineGroupByUsers = processDefinitionMapper.countDefinitionByProjectCodes(projectCodeArray); } @@ -233,7 +233,6 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal return result; } - /** * statistical command status data * @@ -252,28 +251,31 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal Date end = null; Pair, Map> projectIds = getProjectIds(loginUser, result); if (projectIds.getRight() != null) { - List noData = Arrays.stream(CommandType.values()).map(commandType -> new CommandStateCount(0, 0, commandType)).collect(Collectors.toList()); + List noData = Arrays.stream(CommandType.values()) + .map(commandType -> new CommandStateCount(0, 0, commandType)).collect(Collectors.toList()); result.put(Constants.DATA_LIST, noData); putMsg(result, Status.SUCCESS); return result; } Long[] projectCodeArray = getProjectCodesArrays(projectIds.getLeft()); // count normal command state - Map normalCountCommandCounts = commandMapper.countCommandState(start, end, projectCodeArray) - .stream() - .collect(Collectors.toMap(CommandCount::getCommandType, CommandCount::getCount)); + Map normalCountCommandCounts = + commandMapper.countCommandState(start, end, projectCodeArray) + .stream() + .collect(Collectors.toMap(CommandCount::getCommandType, CommandCount::getCount)); // count error command state - Map errorCommandCounts = errorCommandMapper.countCommandState(start, end, projectCodeArray) - .stream() - .collect(Collectors.toMap(CommandCount::getCommandType, CommandCount::getCount)); + Map errorCommandCounts = + errorCommandMapper.countCommandState(start, end, projectCodeArray) + .stream() + .collect(Collectors.toMap(CommandCount::getCommandType, CommandCount::getCount)); List list = Arrays.stream(CommandType.values()) .map(commandType -> new CommandStateCount( errorCommandCounts.getOrDefault(commandType, 0), normalCountCommandCounts.getOrDefault(commandType, 0), - commandType) - ).collect(Collectors.toList()); + commandType)) + .collect(Collectors.toList()); result.put(Constants.DATA_LIST, list); putMsg(result, Status.SUCCESS); @@ -281,7 +283,8 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal } private Pair, Map> getProjectIds(User loginUser, Map result) { - Set projectIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger); + Set projectIds = resourcePermissionCheckService + .userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger); if (projectIds.isEmpty()) { List taskInstanceStateCounts = new ArrayList<>(); result.put(Constants.DATA_LIST, new TaskCountDto(taskInstanceStateCounts)); @@ -308,7 +311,7 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal public Map countQueueState(User loginUser) { Map result = new HashMap<>(); - //TODO need to add detail data info + // TODO need to add detail data info Map dataMap = new HashMap<>(); dataMap.put("taskQueue", 0); dataMap.put("taskKill", 0); @@ -318,15 +321,19 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal } @Override - public List countTaskInstanceAllStatesByProjectCodes(Date startTime, Date endTime, Long[] projectCodes) { - Optional> startTimeStates = Optional.ofNullable(this.taskInstanceMapper.countTaskInstanceStateByProjectCodes(startTime, endTime, projectCodes)); + public List countTaskInstanceAllStatesByProjectCodes(Date startTime, Date endTime, + Long[] projectCodes) { + Optional> startTimeStates = Optional.ofNullable( + this.taskInstanceMapper.countTaskInstanceStateByProjectCodes(startTime, endTime, projectCodes)); - List allState = Arrays.stream(ExecutionStatus.values()).collect(Collectors.toList()); - List needRecountState; + List allState = Arrays.stream(TaskExecutionStatus.values()).collect(Collectors.toList()); + List needRecountState; if (startTimeStates.isPresent() && startTimeStates.get().size() != 0) { - List instanceState = startTimeStates.get().stream().map(ExecuteStatusCount::getExecutionStatus).collect(Collectors.toList()); - //value 0 state need to recount by submit time - needRecountState = allState.stream().filter(ele -> !instanceState.contains(ele)).collect(Collectors.toList()); + List instanceState = + startTimeStates.get().stream().map(ExecuteStatusCount::getState).collect(Collectors.toList()); + // value 0 state need to recount by submit time + needRecountState = + allState.stream().filter(ele -> !instanceState.contains(ele)).collect(Collectors.toList()); if (needRecountState.size() == 0) { return startTimeStates.get(); } @@ -334,10 +341,11 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal needRecountState = allState; } - //use submit time to recount when 0 - //if have any issues with this code, should change to specified states 0 8 9 17 not state count is 0 + // use submit time to recount when 0 + // if have any issues with this code, should change to specified states 0 8 9 17 not state count is 0 List recounts = this.taskInstanceMapper - .countTaskInstanceStateByProjectCodesAndStatesBySubmitTime(startTime, endTime, projectCodes, needRecountState); + .countTaskInstanceStateByProjectCodesAndStatesBySubmitTime(startTime, endTime, projectCodes, + needRecountState); startTimeStates.orElseGet(ArrayList::new).addAll(recounts); return startTimeStates.orElse(null); diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java index 473acf3f39..7cf164aaaa 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java @@ -35,17 +35,7 @@ import org.apache.dolphinscheduler.api.service.ExecutorService; import org.apache.dolphinscheduler.api.service.MonitorService; import org.apache.dolphinscheduler.api.service.ProjectService; import org.apache.dolphinscheduler.common.Constants; -import org.apache.dolphinscheduler.common.enums.CommandType; -import org.apache.dolphinscheduler.common.enums.ComplementDependentMode; -import org.apache.dolphinscheduler.common.enums.CycleEnum; -import org.apache.dolphinscheduler.common.enums.FailureStrategy; -import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.common.enums.Priority; -import org.apache.dolphinscheduler.common.enums.ReleaseState; -import org.apache.dolphinscheduler.common.enums.RunMode; -import org.apache.dolphinscheduler.common.enums.TaskDependType; -import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus; -import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.enums.*; import org.apache.dolphinscheduler.common.model.Server; import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; @@ -67,8 +57,7 @@ import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; -import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; +import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand; import org.apache.dolphinscheduler.remote.command.WorkflowExecutingDataRequestCommand; import org.apache.dolphinscheduler.remote.command.WorkflowExecutingDataResponseCommand; import org.apache.dolphinscheduler.remote.dto.WorkflowExecuteDto; @@ -172,9 +161,9 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ Map startParams, Integer expectedParallelismNumber, int dryRun, ComplementDependentMode complementDependentMode) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project + // check user access for project Map result = - projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START); + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -186,14 +175,15 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ // check process define release state ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(processDefinitionCode); - result = checkProcessDefinitionValid(projectCode, processDefinition, processDefinitionCode, processDefinition.getVersion()); + result = checkProcessDefinitionValid(projectCode, processDefinition, processDefinitionCode, + processDefinition.getVersion()); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (!checkTenantSuitable(processDefinition)) { logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ", - processDefinition.getId(), processDefinition.getName()); + processDefinition.getId(), processDefinition.getName()); putMsg(result, Status.TENANT_NOT_SUITABLE); return result; } @@ -211,9 +201,11 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ * create command */ int create = - this.createCommand(commandType, processDefinition.getCode(), taskDependType, failureStrategy, startNodeList, - cronTime, warningType, loginUser.getId(), warningGroupId, runMode, processInstancePriority, workerGroup, - environmentCode, startParams, expectedParallelismNumber, dryRun, complementDependentMode); + this.createCommand(commandType, processDefinition.getCode(), taskDependType, failureStrategy, + startNodeList, + cronTime, warningType, loginUser.getId(), warningGroupId, runMode, processInstancePriority, + workerGroup, + environmentCode, startParams, expectedParallelismNumber, dryRun, complementDependentMode); if (create > 0) { processDefinition.setWarningGroupId(warningGroupId); @@ -303,20 +295,21 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ public boolean checkSubProcessDefinitionValid(ProcessDefinition processDefinition) { // query all subprocesses under the current process List processTaskRelations = - processTaskRelationMapper.queryDownstreamByProcessDefinitionCode(processDefinition.getCode()); + processTaskRelationMapper.queryDownstreamByProcessDefinitionCode(processDefinition.getCode()); if (processTaskRelations.isEmpty()) { return true; } Set relationCodes = - processTaskRelations.stream().map(ProcessTaskRelation::getPostTaskCode).collect(Collectors.toSet()); + processTaskRelations.stream().map(ProcessTaskRelation::getPostTaskCode).collect(Collectors.toSet()); List taskDefinitions = taskDefinitionMapper.queryByCodeList(relationCodes); // find out the process definition code Set processDefinitionCodeSet = new HashSet<>(); taskDefinitions.stream() - .filter(task -> TaskConstants.TASK_TYPE_SUB_PROCESS.equalsIgnoreCase(task.getTaskType())).forEach( - taskDefinition -> processDefinitionCodeSet.add(Long.valueOf( - JSONUtils.getNodeString(taskDefinition.getTaskParams(), Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)))); + .filter(task -> TaskConstants.TASK_TYPE_SUB_PROCESS.equalsIgnoreCase(task.getTaskType())).forEach( + taskDefinition -> processDefinitionCodeSet.add(Long.valueOf( + JSONUtils.getNodeString(taskDefinition.getTaskParams(), + Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)))); if (processDefinitionCodeSet.isEmpty()) { return true; } @@ -324,11 +317,11 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ // check sub releaseState List processDefinitions = processDefinitionMapper.queryByCodes(processDefinitionCodeSet); return processDefinitions.stream() - .filter(definition -> definition.getReleaseState().equals(ReleaseState.OFFLINE)).collect(Collectors.toSet()) - .isEmpty(); + .filter(definition -> definition.getReleaseState().equals(ReleaseState.OFFLINE)) + .collect(Collectors.toSet()) + .isEmpty(); } - /** * do action to process instance：pause, stop, repeat, recover from pause, recover from stop * @@ -339,12 +332,13 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ * @return execute result code */ @Override - public Map execute(User loginUser, long projectCode, Integer processInstanceId, ExecuteType executeType) { + public Map execute(User loginUser, long projectCode, Integer processInstanceId, + ExecuteType executeType) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project + // check user access for project Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode, - ApiFuncIdentificationConstant.map.get(executeType)); + ApiFuncIdentificationConstant.map.get(executeType)); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -361,12 +355,13 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ } ProcessDefinition processDefinition = - processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (executeType != ExecuteType.STOP && executeType != ExecuteType.PAUSE) { result = - checkProcessDefinitionValid(projectCode, processDefinition, processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + checkProcessDefinitionValid(projectCode, processDefinition, + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -378,14 +373,14 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ } if (!checkTenantSuitable(processDefinition)) { logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ", - processDefinition.getId(), processDefinition.getName()); + processDefinition.getId(), processDefinition.getName()); putMsg(result, Status.TENANT_NOT_SUITABLE); } - //get the startParams user specified at the first starting while repeat running is needed + // get the startParams user specified at the first starting while repeat running is needed Map commandMap = - JSONUtils.parseObject(processInstance.getCommandParam(), new TypeReference>() { - }); + JSONUtils.parseObject(processInstance.getCommandParam(), new TypeReference>() { + }); String startParams = null; if (MapUtils.isNotEmpty(commandMap) && executeType == ExecuteType.REPEAT_RUNNING) { Object startParamsJson = commandMap.get(Constants.CMD_PARAM_START_PARAMS); @@ -397,30 +392,33 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ switch (executeType) { case REPEAT_RUNNING: result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), - processDefinition.getVersion(), CommandType.REPEAT_RUNNING, startParams); + processDefinition.getVersion(), CommandType.REPEAT_RUNNING, startParams); break; case RECOVER_SUSPENDED_PROCESS: result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), - processDefinition.getVersion(), CommandType.RECOVER_SUSPENDED_PROCESS, startParams); + processDefinition.getVersion(), CommandType.RECOVER_SUSPENDED_PROCESS, startParams); break; case START_FAILURE_TASK_PROCESS: result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), - processDefinition.getVersion(), CommandType.START_FAILURE_TASK_PROCESS, startParams); + processDefinition.getVersion(), CommandType.START_FAILURE_TASK_PROCESS, startParams); break; case STOP: - if (processInstance.getState() == ExecutionStatus.READY_STOP) { + if (processInstance.getState() == WorkflowExecutionStatus.READY_STOP) { putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), - processInstance.getState()); + processInstance.getState()); } else { result = - updateProcessInstancePrepare(processInstance, CommandType.STOP, ExecutionStatus.READY_STOP); + updateProcessInstancePrepare(processInstance, CommandType.STOP, + WorkflowExecutionStatus.READY_STOP); } break; case PAUSE: - if (processInstance.getState() == ExecutionStatus.READY_PAUSE) { - putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), processInstance.getState()); + if (processInstance.getState() == WorkflowExecutionStatus.READY_PAUSE) { + putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), + processInstance.getState()); } else { - result = updateProcessInstancePrepare(processInstance, CommandType.PAUSE, ExecutionStatus.READY_PAUSE); + result = updateProcessInstancePrepare(processInstance, CommandType.PAUSE, + WorkflowExecutionStatus.READY_PAUSE); } break; default: @@ -458,7 +456,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ */ private boolean checkTenantSuitable(ProcessDefinition processDefinition) { Tenant tenant = - processService.getTenantForProcess(processDefinition.getTenantId(), processDefinition.getUserId()); + processService.getTenantForProcess(processDefinition.getTenantId(), processDefinition.getUserId()); return tenant != null; } @@ -472,27 +470,27 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ private Map checkExecuteType(ProcessInstance processInstance, ExecuteType executeType) { Map result = new HashMap<>(); - ExecutionStatus executionStatus = processInstance.getState(); + WorkflowExecutionStatus executionStatus = processInstance.getState(); boolean checkResult = false; switch (executeType) { case PAUSE: case STOP: - if (executionStatus.typeIsRunning()) { + if (executionStatus.isRunning()) { checkResult = true; } break; case REPEAT_RUNNING: - if (executionStatus.typeIsFinished()) { + if (executionStatus.isFinished()) { checkResult = true; } break; case START_FAILURE_TASK_PROCESS: - if (executionStatus.typeIsFailure()) { + if (executionStatus.isFailure()) { checkResult = true; } break; case RECOVER_SUSPENDED_PROCESS: - if (executionStatus.typeIsPause() || executionStatus.typeIsCancel()) { + if (executionStatus.isPause() || executionStatus.isStop()) { checkResult = true; } break; @@ -501,7 +499,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ } if (!checkResult) { putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(), - executionStatus.toString(), executeType.toString()); + executionStatus.toString(), executeType.toString()); } else { putMsg(result, Status.SUCCESS); } @@ -517,7 +515,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ * @return update result */ private Map updateProcessInstancePrepare(ProcessInstance processInstance, CommandType commandType, - ExecutionStatus executionStatus) { + WorkflowExecutionStatus executionStatus) { Map result = new HashMap<>(); processInstance.setCommandType(commandType); @@ -527,12 +525,12 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ // determine whether the process is normal if (update > 0) { - // directly send the process instance state change event to target master, not guarantee the event send success - StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand( - processInstance.getId(), 0, processInstance.getState(), processInstance.getId(), 0 - ); + // directly send the process instance state change event to target master, not guarantee the event send + // success + WorkflowStateEventChangeCommand workflowStateEventChangeCommand = new WorkflowStateEventChangeCommand( + processInstance.getId(), 0, processInstance.getState(), processInstance.getId(), 0); Host host = new Host(processInstance.getHost()); - stateEventCallbackService.sendResult(host, stateEventChangeCommand.convert2Command()); + stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command()); putMsg(result, Status.SUCCESS); } else { putMsg(result, Status.EXECUTE_PROCESS_INSTANCE_ERROR); @@ -556,7 +554,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ taskGroupQueue.setForceStart(Flag.YES.getCode()); processService.updateTaskGroupQueue(taskGroupQueue); processService.sendStartTask2Master(processInstance, taskGroupQueue.getTaskId(), - org.apache.dolphinscheduler.remote.command.CommandType.TASK_FORCE_STATE_EVENT_REQUEST); + org.apache.dolphinscheduler.remote.command.CommandType.TASK_FORCE_STATE_EVENT_REQUEST); putMsg(result, Status.SUCCESS); return result; } @@ -575,7 +573,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ int processVersion, CommandType commandType, String startParams) { Map result = new HashMap<>(); - //To add startParams only when repeat running is needed + // To add startParams only when repeat running is needed Map cmdParam = new HashMap<>(); cmdParam.put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, instanceId); if (!StringUtils.isEmpty(startParams)) { @@ -636,7 +634,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ if (processDefinitionTmp.getReleaseState() != ReleaseState.ONLINE) { putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE, processDefinitionTmp.getName()); logger.info("not release process definition id: {} , name : {}", processDefinitionTmp.getId(), - processDefinitionTmp.getName()); + processDefinitionTmp.getName()); return result; } } @@ -722,9 +720,10 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ } try { return createComplementCommandList(schedule, runMode, command, expectedParallelismNumber, - complementDependentMode); + complementDependentMode); } catch (CronParseException cronParseException) { - // We catch the exception here just to make compiler happy, since we have already validated the schedule cron expression before + // We catch the exception here just to make compiler happy, since we have already validated the schedule + // cron expression before return 0; } } else { @@ -743,8 +742,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ */ protected int createComplementCommandList(String scheduleTimeParam, RunMode runMode, Command command, Integer expectedParallelismNumber, - ComplementDependentMode complementDependentMode) - throws CronParseException { + ComplementDependentMode complementDependentMode) throws CronParseException { int createCount = 0; String startDate = null; String endDate = null; @@ -758,7 +756,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ dateList = removeDuplicates(dateList); } if (scheduleParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE) && scheduleParam.containsKey( - CMDPARAM_COMPLEMENT_DATA_END_DATE)) { + CMDPARAM_COMPLEMENT_DATA_END_DATE)) { startDate = scheduleParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE); endDate = scheduleParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE); } @@ -777,11 +775,11 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ // dependent process definition List schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode( - command.getProcessDefinitionCode()); + command.getProcessDefinitionCode()); if (schedules.isEmpty() || complementDependentMode == ComplementDependentMode.OFF_MODE) { logger.info("process code: {} complement dependent in off mode or schedule's size is 0, skip " - + "dependent complement data", command.getProcessDefinitionCode()); + + "dependent complement data", command.getProcessDefinitionCode()); } else { dependentProcessDefinitionCreateCount += createComplementDependentCommand(schedules, command); } @@ -791,10 +789,10 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ case RUN_MODE_PARALLEL: { if (startDate != null && endDate != null) { List schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode( - command.getProcessDefinitionCode()); + command.getProcessDefinitionCode()); List listDate = new ArrayList<>( - CronUtils.getSelfFireDateList(DateUtils.stringToZoneDateTime(startDate), - DateUtils.stringToZoneDateTime(endDate), schedules)); + CronUtils.getSelfFireDateList(DateUtils.stringToZoneDateTime(startDate), + DateUtils.stringToZoneDateTime(endDate), schedules)); int listDateSize = listDate.size(); createCount = listDate.size(); if (!CollectionUtils.isEmpty(listDate)) { @@ -821,18 +819,21 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ endDateIndex += singleCommandItems; } - cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(listDate.get(startDateIndex))); - cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(listDate.get(endDateIndex))); + cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, + DateUtils.dateToString(listDate.get(startDateIndex))); + cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, + DateUtils.dateToString(listDate.get(endDateIndex))); command.setCommandParam(JSONUtils.toJsonString(cmdParam)); processService.createCommand(command); if (schedules.isEmpty() || complementDependentMode == ComplementDependentMode.OFF_MODE) { logger.info( - "process code: {} complement dependent in off mode or schedule's size is 0, skip " - + "dependent complement data", command.getProcessDefinitionCode()); + "process code: {} complement dependent in off mode or schedule's size is 0, skip " + + "dependent complement data", + command.getProcessDefinitionCode()); } else { dependentProcessDefinitionCreateCount += - createComplementDependentCommand(schedules, command); + createComplementDependentCommand(schedules, command); } } } @@ -858,7 +859,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ break; } logger.info("create complement command count: {}, create dependent complement command count: {}", createCount, - dependentProcessDefinitionCreateCount); + dependentProcessDefinitionCreateCount); return createCount; } @@ -877,8 +878,8 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ } List dependentProcessDefinitionList = - getComplementDependentDefinitionList(dependentCommand.getProcessDefinitionCode(), - CronUtils.getMaxCycle(schedules.get(0).getCrontab()), dependentCommand.getWorkerGroup()); + getComplementDependentDefinitionList(dependentCommand.getProcessDefinitionCode(), + CronUtils.getMaxCycle(schedules.get(0).getCrontab()), dependentCommand.getWorkerGroup()); dependentCommand.setTaskDependType(TaskDependType.TASK_POST); for (DependentProcessDefinition dependentProcessDefinition : dependentProcessDefinitionList) { @@ -900,10 +901,10 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ CycleEnum processDefinitionCycle, String workerGroup) { List dependentProcessDefinitionList = - processService.queryDependentProcessDefinitionByProcessDefinitionCode(processDefinitionCode); + processService.queryDependentProcessDefinitionByProcessDefinitionCode(processDefinitionCode); return checkDependentProcessDefinitionValid(dependentProcessDefinitionList, processDefinitionCycle, - workerGroup); + workerGroup); } /** @@ -912,21 +913,22 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ * worker group */ private List checkDependentProcessDefinitionValid( - List dependentProcessDefinitionList, CycleEnum processDefinitionCycle, - String workerGroup) { + List dependentProcessDefinitionList, + CycleEnum processDefinitionCycle, + String workerGroup) { List validDependentProcessDefinitionList = new ArrayList<>(); List processDefinitionCodeList = - dependentProcessDefinitionList.stream().map(DependentProcessDefinition::getProcessDefinitionCode) - .collect(Collectors.toList()); + dependentProcessDefinitionList.stream().map(DependentProcessDefinition::getProcessDefinitionCode) + .collect(Collectors.toList()); Map processDefinitionWorkerGroupMap = - processService.queryWorkerGroupByProcessDefinitionCodes(processDefinitionCodeList); + processService.queryWorkerGroupByProcessDefinitionCodes(processDefinitionCodeList); for (DependentProcessDefinition dependentProcessDefinition : dependentProcessDefinitionList) { if (dependentProcessDefinition.getDependentCycle() == processDefinitionCycle) { - if (processDefinitionWorkerGroupMap.get(dependentProcessDefinition.getProcessDefinitionCode()) - == null) { + if (processDefinitionWorkerGroupMap + .get(dependentProcessDefinition.getProcessDefinitionCode()) == null) { dependentProcessDefinition.setWorkerGroup(workerGroup); } @@ -981,7 +983,8 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ */ private String removeDuplicates(String scheduleTimeList) { if (StringUtils.isNotEmpty(scheduleTimeList)) { - Set dateSet = Arrays.stream(scheduleTimeList.split(COMMA)).map(String::trim).collect(Collectors.toSet()); + Set dateSet = + Arrays.stream(scheduleTimeList.split(COMMA)).map(String::trim).collect(Collectors.toSet()); return String.join(COMMA, dateSet); } return null; @@ -1001,11 +1004,13 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ Host host = new Host(processInstance.getHost()); WorkflowExecutingDataRequestCommand requestCommand = new WorkflowExecutingDataRequestCommand(); requestCommand.setProcessInstanceId(processInstanceId); - org.apache.dolphinscheduler.remote.command.Command command = stateEventCallbackService.sendSync(host, requestCommand.convert2Command()); + org.apache.dolphinscheduler.remote.command.Command command = + stateEventCallbackService.sendSync(host, requestCommand.convert2Command()); if (command == null) { return null; } - WorkflowExecutingDataResponseCommand responseCommand = JSONUtils.parseObject(command.getBody(), WorkflowExecutingDataResponseCommand.class); + WorkflowExecutingDataResponseCommand responseCommand = + JSONUtils.parseObject(command.getBody(), WorkflowExecutingDataResponseCommand.class); return responseCommand.getWorkflowExecuteDto(); } } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java index 99427b954a..833a734377 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java @@ -17,31 +17,20 @@ package org.apache.dolphinscheduler.api.service.impl; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_DELETE; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_UPDATE; -import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_INSTANCE; -import static org.apache.dolphinscheduler.common.Constants.DATA_LIST; -import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT; -import static org.apache.dolphinscheduler.common.Constants.GLOBAL_PARAMS; -import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS; -import static org.apache.dolphinscheduler.common.Constants.PROCESS_INSTANCE_STATE; -import static org.apache.dolphinscheduler.common.Constants.TASK_LIST; -import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_DEPENDENT; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.dolphinscheduler.api.dto.gantt.GanttDto; import org.apache.dolphinscheduler.api.dto.gantt.Task; import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.exceptions.ServiceException; -import org.apache.dolphinscheduler.api.service.ExecutorService; -import org.apache.dolphinscheduler.api.service.LoggerService; -import org.apache.dolphinscheduler.api.service.ProcessDefinitionService; -import org.apache.dolphinscheduler.api.service.ProcessInstanceService; -import org.apache.dolphinscheduler.api.service.ProjectService; -import org.apache.dolphinscheduler.api.service.UsersService; +import org.apache.dolphinscheduler.api.service.*; import org.apache.dolphinscheduler.api.utils.PageInfo; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; @@ -49,57 +38,30 @@ import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.ParameterUtils; import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; -import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; -import org.apache.dolphinscheduler.dao.entity.ProcessInstance; -import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog; -import org.apache.dolphinscheduler.dao.entity.Project; -import org.apache.dolphinscheduler.dao.entity.ResponseTaskLog; -import org.apache.dolphinscheduler.dao.entity.TaskDefinition; -import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog; -import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.dao.entity.Tenant; -import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper; -import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; -import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; -import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; -import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper; -import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper; -import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; -import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; -import org.apache.dolphinscheduler.dao.mapper.TenantMapper; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode; import org.apache.dolphinscheduler.service.expand.CuringParamsService; import org.apache.dolphinscheduler.service.process.ProcessService; import org.apache.dolphinscheduler.service.task.TaskPluginManager; - -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.*; +import static org.apache.dolphinscheduler.common.Constants.*; +import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_DEPENDENT; /** * process instance service impl @@ -165,10 +127,12 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce * return top n SUCCESS process instance order by running time which started between startTime and endTime */ @Override - public Map queryTopNLongestRunningProcessInstance(User loginUser, long projectCode, int size, String startTime, String endTime) { + public Map queryTopNLongestRunningProcessInstance(User loginUser, long projectCode, int size, + String startTime, String endTime) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -196,7 +160,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce return result; } - List processInstances = processInstanceMapper.queryTopNProcessInstance(size, start, end, ExecutionStatus.SUCCESS, projectCode); + List processInstances = processInstanceMapper.queryTopNProcessInstance(size, start, end, + WorkflowExecutionStatus.SUCCESS, projectCode); result.put(DATA_LIST, processInstances); putMsg(result, Status.SUCCESS); return result; @@ -213,15 +178,17 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce @Override public Map queryProcessInstanceById(User loginUser, long projectCode, Integer processId) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId); - ProcessDefinition processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + ProcessDefinition processDefinition = + processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId); @@ -252,29 +219,32 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce * @return process instance list */ @Override - public Result queryProcessInstanceList(User loginUser, long projectCode, long processDefineCode, String startDate, String endDate, String searchVal, String executorName, - ExecutionStatus stateType, String host, String otherParamsJson, Integer pageNo, Integer pageSize) { + public Result queryProcessInstanceList(User loginUser, long projectCode, long processDefineCode, String startDate, + String endDate, String searchVal, String executorName, + WorkflowExecutionStatus stateType, String host, String otherParamsJson, + Integer pageNo, Integer pageSize) { Result result = new Result(); Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); + // check user access for project + Map checkResult = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); Status resultEnum = (Status) checkResult.get(Constants.STATUS); if (resultEnum != Status.SUCCESS) { - putMsg(result,resultEnum); + putMsg(result, resultEnum); return result; } int[] statusArray = null; // filter by state if (stateType != null) { - statusArray = new int[]{stateType.ordinal()}; + statusArray = new int[]{stateType.getCode()}; } Map checkAndParseDateResult = checkAndParseDateParameters(startDate, endDate); resultEnum = (Status) checkAndParseDateResult.get(Constants.STATUS); if (resultEnum != Status.SUCCESS) { - putMsg(result,resultEnum); + putMsg(result, resultEnum); return result; } Date start = (Date) checkAndParseDateResult.get(Constants.START_TIME); @@ -285,7 +255,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce int executorId = usersService.getUserIdByName(executorName); IPage processInstanceList = processInstanceMapper.queryProcessInstanceListPaging(page, - project.getCode(), processDefineCode, searchVal, executorId, statusArray, host, start, end); + project.getCode(), processDefineCode, searchVal, executorId, statusArray, host, start, end); List processInstances = processInstanceList.getRecords(); List userIds = Collections.emptyList(); @@ -299,7 +269,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce } for (ProcessInstance processInstance : processInstances) { - processInstance.setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime())); + processInstance.setDuration( + DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime())); User executor = idToUserMap.get(processInstance.getExecutorId()); if (null != executor) { processInstance.setExecutorName(executor.getUserName()); @@ -323,15 +294,18 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce * @throws IOException io exception */ @Override - public Map queryTaskListByProcessId(User loginUser, long projectCode, Integer processId) throws IOException { + public Map queryTaskListByProcessId(User loginUser, long projectCode, + Integer processId) throws IOException { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId); - ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + ProcessDefinition processDefinition = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); if (processDefinition != null && projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processId); return result; @@ -354,7 +328,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce for (TaskInstance taskInstance : taskInstanceList) { if (TASK_TYPE_DEPENDENT.equalsIgnoreCase(taskInstance.getTaskType())) { Result logResult = loggerService.queryLog( - taskInstance.getId(), Constants.LOG_QUERY_SKIP_LINE_NUMBER, Constants.LOG_QUERY_LIMIT); + taskInstance.getId(), Constants.LOG_QUERY_SKIP_LINE_NUMBER, Constants.LOG_QUERY_LIMIT); if (logResult.getCode() == Status.SUCCESS.ordinal()) { String log = logResult.getData().getMessage(); Map resultMap = parseLogForDependentResult(log); @@ -372,7 +346,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce } BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(log.getBytes( - StandardCharsets.UTF_8)), StandardCharsets.UTF_8)); + StandardCharsets.UTF_8)), StandardCharsets.UTF_8)); String line; while ((line = br.readLine()) != null) { if (line.contains(DEPENDENT_SPLIT)) { @@ -404,8 +378,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce @Override public Map querySubProcessInstanceByTaskId(User loginUser, long projectCode, Integer taskId) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -428,7 +403,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce } ProcessInstance subWorkflowInstance = processService.findSubProcessInstance( - taskInstance.getProcessInstanceId(), taskInstance.getId()); + taskInstance.getProcessInstanceId(), taskInstance.getId()); if (subWorkflowInstance == null) { putMsg(result, Status.SUB_PROCESS_INSTANCE_NOT_EXIST, taskId); return result; @@ -458,31 +433,35 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce */ @Transactional @Override - public Map updateProcessInstance(User loginUser, long projectCode, Integer processInstanceId, String taskRelationJson, - String taskDefinitionJson, String scheduleTime, Boolean syncDefine, String globalParams, + public Map updateProcessInstance(User loginUser, long projectCode, Integer processInstanceId, + String taskRelationJson, + String taskDefinitionJson, String scheduleTime, Boolean syncDefine, + String globalParams, String locations, int timeout, String tenantCode) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,INSTANCE_UPDATE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_UPDATE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } - //check process instance exists + // check process instance exists ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId); return result; } - //check process instance exists in project - ProcessDefinition processDefinition0 = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + // check process instance exists in project + ProcessDefinition processDefinition0 = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); if (processDefinition0 != null && projectCode != processDefinition0.getProjectCode()) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId); return result; } - //check process instance status - if (!processInstance.getState().typeIsFinished()) { + // check process instance status + if (!processInstance.getState().isFinished()) { putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, - processInstance.getName(), processInstance.getState().toString(), "update"); + processInstance.getName(), processInstance.getState().toString(), "update"); return result; } @@ -516,9 +495,11 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce putMsg(result, Status.UPDATE_TASK_DEFINITION_ERROR); throw new ServiceException(Status.UPDATE_TASK_DEFINITION_ERROR); } - ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); - List taskRelationList = JSONUtils.toList(taskRelationJson, ProcessTaskRelationLog.class); - //check workflow json is valid + ProcessDefinition processDefinition = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + List taskRelationList = + JSONUtils.toList(taskRelationJson, ProcessTaskRelationLog.class); + // check workflow json is valid result = processDefinitionService.checkProcessNodeList(taskRelationJson, taskDefinitionLogs); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; @@ -532,7 +513,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce } tenantId = tenant.getId(); } - processDefinition.set(projectCode, processDefinition.getName(), processDefinition.getDescription(), globalParams, locations, timeout, tenantId); + processDefinition.set(projectCode, processDefinition.getName(), processDefinition.getDescription(), + globalParams, locations, timeout, tenantId); processDefinition.setUpdateTime(new Date()); int insertVersion = processService.saveProcessDefine(loginUser, processDefinition, syncDefine, Boolean.FALSE); if (insertVersion == 0) { @@ -540,7 +522,7 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR); } int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(), - processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs, syncDefine); + processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs, syncDefine); if (insertResult == Constants.EXIT_CODE_SUCCESS) { putMsg(result, Status.SUCCESS); result.put(Constants.DATA_LIST, processDefinition); @@ -561,15 +543,18 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce /** * update process instance attributes */ - private void setProcessInstance(ProcessInstance processInstance, String tenantCode, String scheduleTime, String globalParams, int timeout, String timezone) { + private void setProcessInstance(ProcessInstance processInstance, String tenantCode, String scheduleTime, + String globalParams, int timeout, String timezone) { Date schedule = processInstance.getScheduleTime(); if (scheduleTime != null) { schedule = DateUtils.stringToDate(scheduleTime); } processInstance.setScheduleTime(schedule); List globalParamList = JSONUtils.toList(globalParams, Property.class); - Map globalParamMap = globalParamList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); - globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(), globalParamMap, globalParamList, processInstance.getCmdTypeIfComplement(), schedule, timezone); + Map globalParamMap = + globalParamList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); + globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(), globalParamMap, + globalParamList, processInstance.getCmdTypeIfComplement(), schedule, timezone); processInstance.setTimeout(timeout); processInstance.setTenantCode(tenantCode); processInstance.setGlobalParams(globalParams); @@ -586,8 +571,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce @Override public Map queryParentInstanceBySubId(User loginUser, long projectCode, Integer subId) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -626,8 +612,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce @Transactional public Map deleteProcessInstanceById(User loginUser, long projectCode, Integer processInstanceId) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,INSTANCE_DELETE); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -636,14 +623,15 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, String.valueOf(processInstanceId)); return result; } - //check process instance status - if (!processInstance.getState().typeIsFinished()) { + // check process instance status + if (!processInstance.getState().isFinished()) { putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(), processInstance.getState().toString(), "delete"); return result; } - ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + ProcessDefinition processDefinition = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); if (processDefinition != null && projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, String.valueOf(processInstanceId)); return result; @@ -689,7 +677,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce throw new RuntimeException("workflow instance is null"); } - ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + ProcessDefinition processDefinition = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); if (processDefinition != null && projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId); return result; @@ -701,14 +690,15 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce timezone = commandParam.get(Constants.SCHEDULE_TIMEZONE); } Map timeParams = BusinessTimeUtils - .getBusinessTime(processInstance.getCmdTypeIfComplement(), - processInstance.getScheduleTime(), timezone); + .getBusinessTime(processInstance.getCmdTypeIfComplement(), + processInstance.getScheduleTime(), timezone); String userDefinedParams = processInstance.getGlobalParams(); // global params List globalParams = new ArrayList<>(); // global param string - String globalParamStr = ParameterUtils.convertParameterPlaceholders(JSONUtils.toJsonString(globalParams), timeParams); + String globalParamStr = + ParameterUtils.convertParameterPlaceholders(JSONUtils.toJsonString(globalParams), timeParams); globalParams = JSONUtils.toList(globalParamStr, Property.class); for (Property property : globalParams) { timeParams.put(property.getProp(), property.getValue()); @@ -733,12 +723,14 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce /** * get local params */ - private Map> getLocalParams(ProcessInstance processInstance, Map timeParams) { + private Map> getLocalParams(ProcessInstance processInstance, + Map timeParams) { Map> localUserDefParams = new HashMap<>(); - List taskInstanceList = taskInstanceMapper.findValidTaskListByProcessId(processInstance.getId(), Flag.YES); + List taskInstanceList = + taskInstanceMapper.findValidTaskListByProcessId(processInstance.getId(), Flag.YES); for (TaskInstance taskInstance : taskInstanceList) { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion( - taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); + taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); String localParams = JSONUtils.getNodeString(taskDefinitionLog.getTaskParams(), LOCAL_PARAMS); if (!StringUtils.isEmpty(localParams)) { @@ -774,23 +766,23 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce } ProcessDefinition processDefinition = processDefinitionLogMapper.queryByDefinitionCodeAndVersion( - processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion() - ); + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId); return result; } GanttDto ganttDto = new GanttDto(); DAG dag = processService.genDagGraph(processDefinition); - //topological sort + // topological sort List nodeList = dag.topologicalSort(); ganttDto.setTaskNames(nodeList); List taskList = new ArrayList<>(); for (String node : nodeList) { - TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndCode(processInstanceId, Long.parseLong(node)); + TaskInstance taskInstance = + taskInstanceMapper.queryByInstanceIdAndCode(processInstanceId, Long.parseLong(node)); if (taskInstance == null) { continue; } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java index 1364915203..73a2e3f96a 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java @@ -37,7 +37,7 @@ import org.apache.dolphinscheduler.dao.entity.User; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.service.process.ProcessService; import java.util.Date; @@ -99,35 +99,36 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst */ @Override public Result queryTaskListPaging(User loginUser, - long projectCode, - Integer processInstanceId, - String processInstanceName, - String taskName, - String executorName, - String startDate, - String endDate, - String searchVal, - ExecutionStatus stateType, - String host, - Integer pageNo, - Integer pageSize) { + long projectCode, + Integer processInstanceId, + String processInstanceName, + String taskName, + String executorName, + String startDate, + String endDate, + String searchVal, + TaskExecutionStatus stateType, + String host, + Integer pageNo, + Integer pageSize) { Result result = new Result(); Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode, TASK_INSTANCE); + // check user access for project + Map checkResult = + projectService.checkProjectAndAuth(loginUser, project, projectCode, TASK_INSTANCE); Status status = (Status) checkResult.get(Constants.STATUS); if (status != Status.SUCCESS) { - putMsg(result,status); + putMsg(result, status); return result; } int[] statusArray = null; if (stateType != null) { - statusArray = new int[]{stateType.ordinal()}; + statusArray = new int[]{stateType.getCode()}; } Map checkAndParseDateResult = checkAndParseDateParameters(startDate, endDate); status = (Status) checkAndParseDateResult.get(Constants.STATUS); if (status != Status.SUCCESS) { - putMsg(result,status); + putMsg(result, status); return result; } Date start = (Date) checkAndParseDateResult.get(Constants.START_TIME); @@ -136,13 +137,14 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst PageInfo> pageInfo = new PageInfo<>(pageNo, pageSize); int executorId = usersService.getUserIdByName(executorName); IPage taskInstanceIPage = taskInstanceMapper.queryTaskInstanceListPaging( - page, project.getCode(), processInstanceId, processInstanceName, searchVal, taskName, executorId, statusArray, host, start, end - ); + page, project.getCode(), processInstanceId, processInstanceName, searchVal, taskName, executorId, + statusArray, host, start, end); Set exclusionSet = new HashSet<>(); exclusionSet.add(Constants.CLASS); exclusionSet.add("taskJson"); List taskInstanceList = taskInstanceIPage.getRecords(); - List executorIds = taskInstanceList.stream().map(TaskInstance::getExecutorId).distinct().collect(Collectors.toList()); + List executorIds = + taskInstanceList.stream().map(TaskInstance::getExecutorId).distinct().collect(Collectors.toList()); List users = usersService.queryUser(executorIds); Map userMap = users.stream().collect(Collectors.toMap(User::getId, v -> v)); for (TaskInstance taskInstance : taskInstanceList) { @@ -171,8 +173,9 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst @Override public Map forceTaskSuccess(User loginUser, long projectCode, Integer taskInstanceId) { Project project = projectMapper.queryByCode(projectCode); - //check user access for project - Map result = projectService.checkProjectAndAuth(loginUser, project, projectCode,FORCED_SUCCESS); + // check user access for project + Map result = + projectService.checkProjectAndAuth(loginUser, project, projectCode, FORCED_SUCCESS); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } @@ -191,13 +194,13 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst } // check whether the task instance state type is failure or cancel - if (!task.getState().typeIsFailure() && !task.getState().typeIsCancel()) { + if (!task.getState().isFailure() && !task.getState().isKill()) { putMsg(result, Status.TASK_INSTANCE_STATE_OPERATION_ERROR, taskInstanceId, task.getState().toString()); return result; } // change the state of the task instance - task.setState(ExecutionStatus.FORCED_SUCCESS); + task.setState(TaskExecutionStatus.FORCED_SUCCESS); int changedNum = taskInstanceMapper.updateById(task); if (changedNum > 0) { processService.forceProcessInstanceSuccessByTaskInstanceId(taskInstanceId); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java index 963eda2b69..8f4fd9902d 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java @@ -24,8 +24,8 @@ import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.service.ProcessInstanceService; import org.apache.dolphinscheduler.api.utils.Result; import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; @@ -56,13 +56,14 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { mockResult.setCode(Status.SUCCESS.getCode()); PowerMockito.when(processInstanceService .queryProcessInstanceList(Mockito.any(), Mockito.anyLong(), Mockito.anyLong(), Mockito.any(), - Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any())) + Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any())) .thenReturn(mockResult); MultiValueMap paramsMap = new LinkedMultiValueMap<>(); paramsMap.add("processDefineCode", "91"); paramsMap.add("searchVal", "cxc"); - paramsMap.add("stateType", String.valueOf(ExecutionStatus.SUCCESS)); + paramsMap.add("stateType", WorkflowExecutionStatus.SUCCESS.name()); paramsMap.add("host", "192.168.1.13"); paramsMap.add("startDate", "2019-12-15 00:00:00"); paramsMap.add("endDate", "2019-12-16 00:00:00"); @@ -84,7 +85,8 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testQueryTaskListByProcessId() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.PROJECT_NOT_FOUND); - PowerMockito.when(processInstanceService.queryTaskListByProcessId(Mockito.any(), Mockito.anyLong(), Mockito.any())) + PowerMockito + .when(processInstanceService.queryTaskListByProcessId(Mockito.any(), Mockito.anyLong(), Mockito.any())) .thenReturn(mockResult); MvcResult mvcResult = mockMvc.perform(get("/projects/{projectCode}/process-instances/{id}/tasks", "1113", "123") @@ -103,12 +105,15 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.SUCCESS); PowerMockito.when(processInstanceService - .updateProcessInstance(Mockito.any(), Mockito.anyLong(), Mockito.anyInt(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString(), - Mockito.anyString(), Mockito.anyInt(), Mockito.anyString())).thenReturn(mockResult); + .updateProcessInstance(Mockito.any(), Mockito.anyLong(), Mockito.anyInt(), Mockito.anyString(), + Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString(), + Mockito.anyString(), Mockito.anyInt(), Mockito.anyString())) + .thenReturn(mockResult); - String json = "[{\"name\":\"\",\"pre_task_code\":0,\"pre_task_version\":0,\"post_task_code\":123456789,\"post_task_version\":1," - + "\"condition_type\":0,\"condition_params\":\"{}\"},{\"name\":\"\",\"pre_task_code\":123456789,\"pre_task_version\":1," - + "\"post_task_code\":123451234,\"post_task_version\":1,\"condition_type\":0,\"condition_params\":\"{}\"}]"; + String json = + "[{\"name\":\"\",\"pre_task_code\":0,\"pre_task_version\":0,\"post_task_code\":123456789,\"post_task_version\":1," + + "\"condition_type\":0,\"condition_params\":\"{}\"},{\"name\":\"\",\"pre_task_code\":123456789,\"pre_task_version\":1," + + "\"post_task_code\":123451234,\"post_task_version\":1,\"condition_type\":0,\"condition_params\":\"{}\"}]"; String locations = "{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}"; @@ -136,7 +141,9 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testQueryProcessInstanceById() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.SUCCESS); - PowerMockito.when(processInstanceService.queryProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())).thenReturn(mockResult); + PowerMockito.when( + processInstanceService.queryProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())) + .thenReturn(mockResult); MvcResult mvcResult = mockMvc.perform(get("/projects/{projectCode}/process-instances/{id}", "1113", "123") .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) @@ -152,11 +159,13 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testQuerySubProcessInstanceByTaskId() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.TASK_INSTANCE_NOT_EXISTS); - PowerMockito.when(processInstanceService.querySubProcessInstanceByTaskId(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())).thenReturn(mockResult); + PowerMockito.when(processInstanceService.querySubProcessInstanceByTaskId(Mockito.any(), Mockito.anyLong(), + Mockito.anyInt())).thenReturn(mockResult); - MvcResult mvcResult = mockMvc.perform(get("/projects/{projectCode}/process-instances/query-sub-by-parent", "1113") - .header(SESSION_ID, sessionId) - .param("taskId", "1203")) + MvcResult mvcResult = mockMvc + .perform(get("/projects/{projectCode}/process-instances/query-sub-by-parent", "1113") + .header(SESSION_ID, sessionId) + .param("taskId", "1203")) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); @@ -170,11 +179,14 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testQueryParentInstanceBySubId() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.PROCESS_INSTANCE_NOT_SUB_PROCESS_INSTANCE); - PowerMockito.when(processInstanceService.queryParentInstanceBySubId(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())).thenReturn(mockResult); + PowerMockito.when( + processInstanceService.queryParentInstanceBySubId(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())) + .thenReturn(mockResult); - MvcResult mvcResult = mockMvc.perform(get("/projects/{projectCode}/process-instances/query-parent-by-sub", "1113") - .header(SESSION_ID, sessionId) - .param("subId", "1204")) + MvcResult mvcResult = mockMvc + .perform(get("/projects/{projectCode}/process-instances/query-parent-by-sub", "1113") + .header(SESSION_ID, sessionId) + .param("subId", "1204")) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); @@ -188,9 +200,10 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testViewVariables() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.SUCCESS); - PowerMockito.when(processInstanceService.viewVariables(1113L,123)).thenReturn(mockResult); - MvcResult mvcResult = mockMvc.perform(get("/projects/{projectCode}/process-instances/{id}/view-variables", "1113", "123") - .header(SESSION_ID, sessionId)) + PowerMockito.when(processInstanceService.viewVariables(1113L, 123)).thenReturn(mockResult); + MvcResult mvcResult = mockMvc + .perform(get("/projects/{projectCode}/process-instances/{id}/view-variables", "1113", "123") + .header(SESSION_ID, sessionId)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); @@ -203,7 +216,9 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { public void testDeleteProcessInstanceById() throws Exception { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.SUCCESS); - PowerMockito.when(processInstanceService.deleteProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())).thenReturn(mockResult); + PowerMockito.when( + processInstanceService.deleteProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())) + .thenReturn(mockResult); MvcResult mvcResult = mockMvc.perform(delete("/projects/{projectCode}/process-instances/{id}", "1113", "123") .header(SESSION_ID, sessionId)) @@ -221,7 +236,9 @@ public class ProcessInstanceControllerTest extends AbstractControllerTest { Map mockResult = new HashMap<>(); mockResult.put(Constants.STATUS, Status.PROCESS_INSTANCE_NOT_EXIST); - PowerMockito.when(processInstanceService.deleteProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())).thenReturn(mockResult); + PowerMockito.when( + processInstanceService.deleteProcessInstanceById(Mockito.any(), Mockito.anyLong(), Mockito.anyInt())) + .thenReturn(mockResult); MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/process-instances/batch-delete", "1113") .header(SESSION_ID, sessionId) .param("processInstanceIds", "1205,1206")) diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java index e58234f25f..852520f1f3 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java @@ -34,11 +34,11 @@ import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.HashMap; import java.util.Map; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -51,6 +51,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; public class TaskInstanceControllerTest extends AbstractControllerTest { + @InjectMocks private TaskInstanceController taskInstanceController; @@ -68,10 +69,11 @@ public class TaskInstanceControllerTest extends AbstractControllerTest { result.setCode(Status.SUCCESS.getCode()); result.setMsg(Status.SUCCESS.getMsg()); - when(taskInstanceService.queryTaskListPaging(any(), eq(1L), eq(1), eq(""), eq(""), eq(""),any(), any(), + when(taskInstanceService.queryTaskListPaging(any(), eq(1L), eq(1), eq(""), eq(""), eq(""), any(), any(), eq(""), Mockito.any(), eq("192.168.xx.xx"), any(), any())).thenReturn(result); Result taskResult = taskInstanceController.queryTaskListPaging(null, 1L, 1, "", "", - "", "", ExecutionStatus.SUCCESS,"192.168.xx.xx", "2020-01-01 00:00:00", "2020-01-02 00:00:00",pageNo, pageSize); + "", "", TaskExecutionStatus.SUCCESS, "192.168.xx.xx", "2020-01-01 00:00:00", "2020-01-02 00:00:00", + pageNo, pageSize); Assert.assertEquals(Integer.valueOf(Status.SUCCESS.getCode()), taskResult.getCode()); } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java index 9d318b6cef..1ae0455f61 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java @@ -21,7 +21,6 @@ import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationCon import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; import org.apache.dolphinscheduler.api.dto.CommandStateCount; @@ -45,7 +44,6 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.text.MessageFormat; import java.util.ArrayList; @@ -56,6 +54,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -120,7 +119,7 @@ public class DataAnalysisServiceTest { project.setName("test"); resultMap = new HashMap<>(); Mockito.when(projectMapper.selectById(1)).thenReturn(project); - Mockito.when(projectService.hasProjectAndPerm(user, project, resultMap,PROJECT_OVERVIEW)).thenReturn(true); + Mockito.when(projectService.hasProjectAndPerm(user, project, resultMap, PROJECT_OVERVIEW)).thenReturn(true); Mockito.when(projectMapper.queryByCode(1L)).thenReturn(project); } @@ -142,15 +141,15 @@ public class DataAnalysisServiceTest { Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); Mockito.when(projectMapper.queryByCode(1L)).thenReturn(getProject("test")); - //SUCCESS + // SUCCESS Mockito.when(taskInstanceMapper.countTaskInstanceStateByProjectCodes(DateUtils.stringToDate(startDate), - DateUtils.stringToDate(endDate), - new Long[] {1L})).thenReturn(getTaskInstanceStateCounts()); + DateUtils.stringToDate(endDate), + new Long[]{1L})).thenReturn(getTaskInstanceStateCounts()); Mockito.when(projectMapper.selectById(Mockito.any())).thenReturn(getProject("test")); Mockito.when(projectService.hasProjectAndPerm(Mockito.any(), - Mockito.any(), - (Map) Mockito.any(), - Mockito.any())).thenReturn(true); + Mockito.any(), + (Map) Mockito.any(), + Mockito.any())).thenReturn(true); result = dataAnalysisServiceImpl.countTaskStateByProject(user, 1, startDate, endDate); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); @@ -164,7 +163,7 @@ public class DataAnalysisServiceTest { // checkProject false Map failResult = new HashMap<>(); putMsg(failResult, Status.PROJECT_NOT_FOUND, 1); - Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(),any())).thenReturn(failResult); + Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(failResult); failResult = dataAnalysisServiceImpl.countTaskStateByProject(user, 1, startDate, endDate); Assert.assertEquals(Status.PROJECT_NOT_FOUND, failResult.get(Constants.STATUS)); } @@ -173,7 +172,7 @@ public class DataAnalysisServiceTest { public void testCountTaskStateByProject_paramValid() { Map result = new HashMap<>(); putMsg(result, Status.SUCCESS, null); - Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(),any())).thenReturn(result); + Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); Mockito.when(projectMapper.queryByCode(1L)).thenReturn(getProject("test")); // when date in illegal format then return error message @@ -199,19 +198,20 @@ public class DataAnalysisServiceTest { public void testCountTaskStateByProject_allCountZero() { Map result = new HashMap<>(); putMsg(result, Status.SUCCESS, null); - Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(),any())).thenReturn(result); + Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); Mockito.when(projectMapper.queryByCode(1L)).thenReturn(getProject("test")); // when general user doesn't have any task then return all count are 0 user.setUserType(UserType.GENERAL_USER); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, serviceLogger)) + Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, + serviceLogger)) .thenReturn(projectIds()); Mockito.when(taskInstanceMapper.countTaskInstanceStateByProjectCodes(any(), any(), any())).thenReturn( Collections.emptyList()); result = dataAnalysisServiceImpl.countTaskStateByProject(user, 1, null, null); assertThat(result.get(Constants.DATA_LIST)).extracting("totalCount").isEqualTo(0); assertThat(result.get(Constants.DATA_LIST)).extracting("taskCountDtos").asList().hasSameSizeAs( - ExecutionStatus.values()); + TaskExecutionStatus.values()); assertThat(result.get(Constants.DATA_LIST)).extracting("taskCountDtos").asList().extracting( "count").allMatch(count -> count.equals(0)); } @@ -220,13 +220,15 @@ public class DataAnalysisServiceTest { public void testCountTaskStateByProject_noData() { Map result = new HashMap<>(); putMsg(result, Status.SUCCESS, null); - Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(),any())).thenReturn(result); + Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); Mockito.when(projectMapper.queryByCode(1L)).thenReturn(getProject("test")); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, serviceLogger)).thenReturn(projectIds()); + Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, + serviceLogger)).thenReturn(projectIds()); // when instanceStateCounter return null, then return nothing user.setUserType(UserType.GENERAL_USER); - PowerMockito.when(taskInstanceMapper.countTaskInstanceStateByProjectCodes(any(), any(), any())).thenReturn(null); + PowerMockito.when(taskInstanceMapper.countTaskInstanceStateByProjectCodes(any(), any(), any())) + .thenReturn(null); result = dataAnalysisServiceImpl.countTaskStateByProject(user, 1, null, null); Assert.assertNull(result.get(Constants.DATA_LIST)); } @@ -238,7 +240,7 @@ public class DataAnalysisServiceTest { Mockito.when(projectMapper.queryByCode(1L)).thenReturn(getProject("test")); - //checkProject false + // checkProject false Map failResult = new HashMap<>(); putMsg(failResult, Status.PROJECT_NOT_FOUND, 1); Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(failResult); @@ -249,14 +251,14 @@ public class DataAnalysisServiceTest { putMsg(result, Status.SUCCESS, null); Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); - //SUCCESS + // SUCCESS Mockito.when(processInstanceMapper.countInstanceStateByProjectCodes(DateUtils.stringToDate(startDate), - DateUtils.stringToDate(endDate), - new Long[] {1L})).thenReturn(getTaskInstanceStateCounts()); + DateUtils.stringToDate(endDate), + new Long[]{1L})).thenReturn(getTaskInstanceStateCounts()); Mockito.when(projectService.hasProjectAndPerm(Mockito.any(), - Mockito.any(), - (Map) Mockito.any(), - Mockito.any())).thenReturn(true); + Mockito.any(), + (Map) Mockito.any(), + Mockito.any())).thenReturn(true); result = dataAnalysisServiceImpl.countProcessInstanceStateByProject(user, 1, startDate, endDate); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); @@ -268,15 +270,17 @@ public class DataAnalysisServiceTest { Map result = new HashMap<>(); putMsg(result, Status.SUCCESS, null); - Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(),any())).thenReturn(result); + Mockito.when(projectService.checkProjectAndAuth(any(), any(), anyLong(), any())).thenReturn(result); Mockito.when(processDefinitionMapper.countDefinitionByProjectCodes( Mockito.any(Long[].class))).thenReturn(new ArrayList()); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, serviceLogger)).thenReturn(projectIds()); + Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, + serviceLogger)).thenReturn(projectIds()); result = dataAnalysisServiceImpl.countDefinitionByUser(user, 0); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, serviceLogger)).thenReturn(Collections.emptySet()); + Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, + serviceLogger)).thenReturn(Collections.emptySet()); result = dataAnalysisServiceImpl.countDefinitionByUser(user, 0); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); } @@ -299,12 +303,15 @@ public class DataAnalysisServiceTest { // when no command found then return all count are 0 Mockito.when(commandMapper.countCommandState(any(), any(), any())).thenReturn(Collections.emptyList()); Mockito.when(errorCommandMapper.countCommandState(any(), any(), any())).thenReturn(Collections.emptyList()); - Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, serviceLogger)).thenReturn(projectIds()); + Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, 1, + serviceLogger)).thenReturn(projectIds()); Map result5 = dataAnalysisServiceImpl.countCommandState(user); assertThat(result5).containsEntry(Constants.STATUS, Status.SUCCESS); - assertThat(result5.get(Constants.DATA_LIST)).asList().extracting("errorCount").allMatch(count -> count.equals(0)); - assertThat(result5.get(Constants.DATA_LIST)).asList().extracting("normalCount").allMatch(count -> count.equals(0)); + assertThat(result5.get(Constants.DATA_LIST)).asList().extracting("errorCount") + .allMatch(count -> count.equals(0)); + assertThat(result5.get(Constants.DATA_LIST)).asList().extracting("normalCount") + .allMatch(count -> count.equals(0)); // when command found then return combination result CommandCount normalCommandCount = new CommandCount(); @@ -313,8 +320,10 @@ public class DataAnalysisServiceTest { CommandCount errorCommandCount = new CommandCount(); errorCommandCount.setCommandType(CommandType.START_PROCESS); errorCommandCount.setCount(5); - Mockito.when(commandMapper.countCommandState(any(), any(), any())).thenReturn(Collections.singletonList(normalCommandCount)); - Mockito.when(errorCommandMapper.countCommandState(any(), any(), any())).thenReturn(Collections.singletonList(errorCommandCount)); + Mockito.when(commandMapper.countCommandState(any(), any(), any())) + .thenReturn(Collections.singletonList(normalCommandCount)); + Mockito.when(errorCommandMapper.countCommandState(any(), any(), any())) + .thenReturn(Collections.singletonList(errorCommandCount)); Map result6 = dataAnalysisServiceImpl.countCommandState(user); @@ -347,7 +356,7 @@ public class DataAnalysisServiceTest { private List getTaskInstanceStateCounts() { List taskInstanceStateCounts = new ArrayList<>(1); ExecuteStatusCount executeStatusCount = new ExecuteStatusCount(); - executeStatusCount.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + executeStatusCount.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstanceStateCounts.add(executeStatusCount); return taskInstanceStateCounts; diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java index 44e149285f..9affbd2c2f 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java @@ -45,7 +45,6 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService; import org.apache.dolphinscheduler.service.process.ProcessService; @@ -72,6 +71,7 @@ import org.slf4j.LoggerFactory; */ @RunWith(MockitoJUnitRunner.Silent.class) public class ExecutorServiceTest { + private static final Logger logger = LoggerFactory.getLogger(ExecutorServiceTest.class); private static final Logger baseServiceLogger = LoggerFactory.getLogger(BaseServiceImpl.class); @@ -153,7 +153,7 @@ public class ExecutorServiceTest { // processInstance processInstance.setId(processInstanceId); - processInstance.setState(ExecutionStatus.FAILURE); + processInstance.setState(WorkflowExecutionStatus.FAILURE); processInstance.setExecutorId(userId); processInstance.setTenantId(tenantId); processInstance.setProcessDefinitionVersion(1); @@ -173,7 +173,8 @@ public class ExecutorServiceTest { // mock Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project); - Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START)).thenReturn(checkProjectAndAuth()); + Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START)) + .thenReturn(checkProjectAndAuth()); Mockito.when(processDefinitionMapper.queryByCode(processDefinitionCode)).thenReturn(processDefinition); Mockito.when(processService.getTenantForProcess(tenantId, userId)).thenReturn(new Tenant()); Mockito.when(processService.createCommand(any(Command.class))).thenReturn(1); @@ -185,7 +186,7 @@ public class ExecutorServiceTest { } @Test - public void testForceStartTaskInstance(){ + public void testForceStartTaskInstance() { Map result = executorService.forceStartTaskInstance(loginUser, taskQueueId); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); @@ -197,9 +198,12 @@ public class ExecutorServiceTest { @Test public void testNoComplement() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(zeroSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.START_PROCESS, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.START_PROCESS, null, null, null, null, 0, RunMode.RUN_MODE_SERIAL, @@ -216,13 +220,16 @@ public class ExecutorServiceTest { @Test public void testComplementWithStartNodeList() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(zeroSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.START_PROCESS, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.START_PROCESS, null, "n1,n2", null, null, 0, RunMode.RUN_MODE_SERIAL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 0, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); verify(processService, times(1)).createCommand(any(Command.class)); @@ -235,13 +242,16 @@ public class ExecutorServiceTest { @Test public void testDateError() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(zeroSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2022-01-07 12:12:12\",\"complementEndDate\":\"2022-01-06 12:12:12\"}", CommandType.COMPLEMENT_DATA, + processDefinitionCode, + "{\"complementStartDate\":\"2022-01-07 12:12:12\",\"complementEndDate\":\"2022-01-06 12:12:12\"}", + CommandType.COMPLEMENT_DATA, null, null, null, null, 0, RunMode.RUN_MODE_SERIAL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(Status.START_PROCESS_INSTANCE_ERROR, result.get(Constants.STATUS)); verify(processService, times(0)).createCommand(any(Command.class)); @@ -253,13 +263,16 @@ public class ExecutorServiceTest { @Test public void testSerial() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(zeroSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.COMPLEMENT_DATA, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.COMPLEMENT_DATA, null, null, null, null, 0, RunMode.RUN_MODE_SERIAL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); verify(processService, times(1)).createCommand(any(Command.class)); @@ -271,13 +284,16 @@ public class ExecutorServiceTest { @Test public void testParallelWithOutSchedule() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(zeroSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.COMPLEMENT_DATA, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.COMPLEMENT_DATA, null, null, null, null, 0, RunMode.RUN_MODE_PARALLEL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); verify(processService, times(31)).createCommand(any(Command.class)); @@ -290,13 +306,16 @@ public class ExecutorServiceTest { @Test public void testParallelWithSchedule() { - Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(oneSchedulerList()); + Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)) + .thenReturn(oneSchedulerList()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.COMPLEMENT_DATA, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.COMPLEMENT_DATA, null, null, null, null, 0, RunMode.RUN_MODE_PARALLEL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 15, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 15, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); verify(processService, times(15)).createCommand(any(Command.class)); @@ -308,11 +327,13 @@ public class ExecutorServiceTest { Mockito.when(monitorService.getServerListFromRegistry(true)).thenReturn(new ArrayList<>()); Map result = executorService.execProcessInstance(loginUser, projectCode, - processDefinitionCode, "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", CommandType.COMPLEMENT_DATA, + processDefinitionCode, + "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}", + CommandType.COMPLEMENT_DATA, null, null, null, null, 0, RunMode.RUN_MODE_PARALLEL, - Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 0, Constants.DRY_RUN_FLAG_NO, + Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO, ComplementDependentMode.OFF_MODE); Assert.assertEquals(result.get(Constants.STATUS), Status.MASTER_NOT_EXISTS); @@ -321,8 +342,10 @@ public class ExecutorServiceTest { @Test public void testExecuteRepeatRunning() { Mockito.when(processService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true); - Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN )).thenReturn(checkProjectAndAuth()); - Map result = executorService.execute(loginUser, projectCode, processInstanceId, ExecuteType.REPEAT_RUNNING); + Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN)) + .thenReturn(checkProjectAndAuth()); + Map result = + executorService.execute(loginUser, projectCode, processInstanceId, ExecuteType.REPEAT_RUNNING); Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS)); } @@ -418,5 +441,5 @@ public class ExecutorServiceTest { Assert.assertEquals("2,3", result.get(1)); Assert.assertEquals("4,4", result.get(2)); } - + } diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java index dde556e453..73289dbabf 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java @@ -36,6 +36,8 @@ import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.service.expand.CuringParamsService; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.TaskNode; @@ -61,7 +63,6 @@ import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; import org.apache.dolphinscheduler.dao.mapper.TenantMapper; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.service.process.ProcessService; import org.apache.dolphinscheduler.service.task.TaskPluginManager; import org.junit.Assert; @@ -131,29 +132,31 @@ public class ProcessInstanceServiceTest { @Mock CuringParamsService curingGlobalParamsService; - private String shellJson = "[{\"name\":\"\",\"preTaskCode\":0,\"preTaskVersion\":0,\"postTaskCode\":123456789," - + "\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"},{\"name\":\"\",\"preTaskCode\":123456789," - + "\"preTaskVersion\":1,\"postTaskCode\":123451234,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"}]"; + + "\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"},{\"name\":\"\",\"preTaskCode\":123456789," + + "\"preTaskVersion\":1,\"postTaskCode\":123451234,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":\"{}\"}]"; - private String taskJson = "[{\"name\":\"shell1\",\"description\":\"\",\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," - + "\"localParams\":[],\"rawScript\":\"echo 1\",\"conditionResult\":{\"successNode\":[\"\"],\"failedNode\":[\"\"]},\"dependence\":{}}," - + "\"flag\":\"NORMAL\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":\"0\",\"failRetryInterval\":\"1\"," - + "\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"\",\"timeout\":null,\"delayTime\":\"0\"},{\"name\":\"shell2\",\"description\":\"\"," - + "\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"echo 2\",\"conditionResult\":{\"successNode\"" - + ":[\"\"],\"failedNode\":[\"\"]},\"dependence\":{}},\"flag\":\"NORMAL\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\"," - + "\"failRetryTimes\":\"0\",\"failRetryInterval\":\"1\",\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"\",\"timeout\":null,\"delayTime\":\"0\"}]"; + private String taskJson = + "[{\"name\":\"shell1\",\"description\":\"\",\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," + + "\"localParams\":[],\"rawScript\":\"echo 1\",\"conditionResult\":{\"successNode\":[\"\"],\"failedNode\":[\"\"]},\"dependence\":{}}," + + "\"flag\":\"NORMAL\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":\"0\",\"failRetryInterval\":\"1\"," + + "\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"\",\"timeout\":null,\"delayTime\":\"0\"},{\"name\":\"shell2\",\"description\":\"\"," + + "\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"echo 2\",\"conditionResult\":{\"successNode\"" + + ":[\"\"],\"failedNode\":[\"\"]},\"dependence\":{}},\"flag\":\"NORMAL\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\"," + + "\"failRetryTimes\":\"0\",\"failRetryInterval\":\"1\",\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"\",\"timeout\":null,\"delayTime\":\"0\"}]"; - private String taskRelationJson = "[{\"name\":\"\",\"preTaskCode\":4254865123776,\"preTaskVersion\":1,\"postTaskCode\":4254862762304,\"postTaskVersion\":1,\"conditionType\":0," - + "\"conditionParams\":{}},{\"name\":\"\",\"preTaskCode\":0,\"preTaskVersion\":0,\"postTaskCode\":4254865123776,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":{}}]"; + private String taskRelationJson = + "[{\"name\":\"\",\"preTaskCode\":4254865123776,\"preTaskVersion\":1,\"postTaskCode\":4254862762304,\"postTaskVersion\":1,\"conditionType\":0," + + "\"conditionParams\":{}},{\"name\":\"\",\"preTaskCode\":0,\"preTaskVersion\":0,\"postTaskCode\":4254865123776,\"postTaskVersion\":1,\"conditionType\":0,\"conditionParams\":{}}]"; - private String taskDefinitionJson = "[{\"code\":4254862762304,\"name\":\"test1\",\"version\":1,\"description\":\"\",\"delayTime\":0,\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," - + "\"localParams\":[],\"rawScript\":\"echo 1\",\"dependence\":{},\"conditionResult\":{\"successNode\":[],\"failedNode\":[]},\"waitStartTimeout\":{},\"switchResult\":{}},\"flag\":\"YES\"," - + "\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":0,\"failRetryInterval\":1,\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":null,\"timeout\":0," - + "\"environmentCode\":-1},{\"code\":4254865123776,\"name\":\"test2\",\"version\":1,\"description\":\"\",\"delayTime\":0,\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," - + "\"localParams\":[],\"rawScript\":\"echo 2\",\"dependence\":{},\"conditionResult\":{\"successNode\":[],\"failedNode\":[]},\"waitStartTimeout\":{},\"switchResult\":{}},\"flag\":\"YES\"," - + "\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":0,\"failRetryInterval\":1,\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"WARN\",\"timeout\":0," - + "\"environmentCode\":-1}]"; + private String taskDefinitionJson = + "[{\"code\":4254862762304,\"name\":\"test1\",\"version\":1,\"description\":\"\",\"delayTime\":0,\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," + + "\"localParams\":[],\"rawScript\":\"echo 1\",\"dependence\":{},\"conditionResult\":{\"successNode\":[],\"failedNode\":[]},\"waitStartTimeout\":{},\"switchResult\":{}},\"flag\":\"YES\"," + + "\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":0,\"failRetryInterval\":1,\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":null,\"timeout\":0," + + "\"environmentCode\":-1},{\"code\":4254865123776,\"name\":\"test2\",\"version\":1,\"description\":\"\",\"delayTime\":0,\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[]," + + "\"localParams\":[],\"rawScript\":\"echo 2\",\"dependence\":{},\"conditionResult\":{\"successNode\":[],\"failedNode\":[]},\"waitStartTimeout\":{},\"switchResult\":{}},\"flag\":\"YES\"," + + "\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":0,\"failRetryInterval\":1,\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"WARN\",\"timeout\":0," + + "\"environmentCode\":-1}]"; @Test public void testQueryProcessInstanceList() { @@ -163,12 +166,13 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); - Result proejctAuthFailRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 46, "2020-01-01 00:00:00", - "2020-01-02 00:00:00", "", "test_user", ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); + Result proejctAuthFailRes = + processInstanceService.queryProcessInstanceList(loginUser, projectCode, 46, "2020-01-01 00:00:00", + "2020-01-02 00:00:00", "", "test_user", WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); Assert.assertEquals(Status.PROJECT_NOT_FOUND.getCode(), (int) proejctAuthFailRes.getCode()); Date start = DateUtils.stringToDate("2020-01-01 00:00:00"); @@ -182,57 +186,64 @@ public class ProcessInstanceServiceTest { // data parameter check putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(processDefineMapper.selectById(Mockito.anyInt())).thenReturn(getProcessDefinition()); - when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class) - , Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), - eq("192.168.xx.xx"), Mockito.any(), Mockito.any())).thenReturn(pageReturn); + when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), Mockito.any(), Mockito.any(), + Mockito.any(), Mockito.any(), Mockito.any(), + eq("192.168.xx.xx"), Mockito.any(), Mockito.any())).thenReturn(pageReturn); - Result dataParameterRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "20200101 00:00:00", - "20200102 00:00:00", "", loginUser.getUserName(), ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); + Result dataParameterRes = + processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "20200101 00:00:00", + "20200102 00:00:00", "", loginUser.getUserName(), WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int) dataParameterRes.getCode()); - //project auth success + // project auth success putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(usersService.queryUser(loginUser.getId())).thenReturn(loginUser); when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(loginUser.getId()); - when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1L), eq(""), eq(-1), Mockito.any(), - eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); + when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), + eq(1L), eq(""), eq(-1), Mockito.any(), + eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); when(usersService.queryUser(processInstance.getExecutorId())).thenReturn(loginUser); - Result successRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", - "2020-01-02 00:00:00", "", loginUser.getUserName(), ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)successRes.getCode()); + Result successRes = + processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", + "2020-01-02 00:00:00", "", loginUser.getUserName(), WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) successRes.getCode()); // data parameter empty - when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1L), eq(""), eq(-1), Mockito.any(), - eq("192.168.xx.xx"), eq(null), eq(null))).thenReturn(pageReturn); + when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), + eq(1L), eq(""), eq(-1), Mockito.any(), + eq("192.168.xx.xx"), eq(null), eq(null))).thenReturn(pageReturn); successRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "", - "", "", loginUser.getUserName(), ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)successRes.getCode()); + "", "", loginUser.getUserName(), WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) successRes.getCode()); - //executor null + // executor null when(usersService.queryUser(loginUser.getId())).thenReturn(null); when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(-1); - Result executorExistRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", - "2020-01-02 00:00:00", "", "admin", ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); + Result executorExistRes = + processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", + "2020-01-02 00:00:00", "", "admin", WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)executorExistRes.getCode()); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) executorExistRes.getCode()); - //executor name empty - when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1L), eq(""), eq(0), Mockito.any(), - eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); - Result executorEmptyRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", - "2020-01-02 00:00:00", "", "", ExecutionStatus.SUBMITTED_SUCCESS, - "192.168.xx.xx", "",1, 10); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)executorEmptyRes.getCode()); + // executor name empty + when(processInstanceMapper.queryProcessInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), + eq(1L), eq(""), eq(0), Mockito.any(), + eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); + Result executorEmptyRes = + processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00", + "2020-01-02 00:00:00", "", "", WorkflowExecutionStatus.SUBMITTED_SUCCESS, + "192.168.xx.xx", "", 1, 10); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) executorEmptyRes.getCode()); } @@ -249,21 +260,23 @@ public class ProcessInstanceServiceTest { Date start = DateUtils.stringToDate(startTime); Date end = DateUtils.stringToDate(endTime); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); - Map proejctAuthFailRes = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, endTime); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); + Map proejctAuthFailRes = processInstanceService + .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, endTime); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //project auth success + // project auth success putMsg(result, Status.SUCCESS, projectCode); ProcessInstance processInstance = getProcessInstance(); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(usersService.queryUser(loginUser.getId())).thenReturn(loginUser); when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(loginUser.getId()); when(usersService.queryUser(processInstance.getExecutorId())).thenReturn(loginUser); - Map successRes = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, endTime); + Map successRes = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser, + projectCode, size, startTime, endTime); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); } @@ -276,30 +289,31 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); - Map proejctAuthFailRes = processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); + Map proejctAuthFailRes = + processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //project auth success + // project auth success ProcessInstance processInstance = getProcessInstance(); putMsg(result, Status.SUCCESS, projectCode); ProcessDefinition processDefinition = getProcessDefinition(); processDefinition.setProjectCode(projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(processService.findProcessInstanceDetailById(processInstance.getId())).thenReturn(processInstance); when(processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion())).thenReturn(processDefinition); + processInstance.getProcessDefinitionVersion())).thenReturn(processDefinition); Map successRes = processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); - //worker group null + // worker group null Map workerNullRes = processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1); Assert.assertEquals(Status.SUCCESS, workerNullRes.get(Constants.STATUS)); - //worker group exist + // worker group exist WorkerGroup workerGroup = getWorkGroup(); Map workerExistRes = processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1); Assert.assertEquals(Status.SUCCESS, workerExistRes.get(Constants.STATUS)); @@ -313,16 +327,17 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); - Map proejctAuthFailRes = processInstanceService.queryTaskListByProcessId(loginUser, projectCode, 1); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); + Map proejctAuthFailRes = + processInstanceService.queryTaskListByProcessId(loginUser, projectCode, 1); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //project auth success + // project auth success putMsg(result, Status.SUCCESS, projectCode); ProcessInstance processInstance = getProcessInstance(); - processInstance.setState(ExecutionStatus.SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUCCESS); TaskInstance taskInstance = new TaskInstance(); taskInstance.setTaskType("SHELL"); List taskInstanceList = new ArrayList<>(); @@ -331,7 +346,7 @@ public class ProcessInstanceServiceTest { res.setCode(Status.SUCCESS.ordinal()); res.setData("xxx"); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(processService.findProcessInstanceDetailById(processInstance.getId())).thenReturn(processInstance); when(processService.findValidTaskListByProcessId(processInstance.getId())).thenReturn(taskInstanceList); when(loggerService.queryLog(taskInstance.getId(), 0, 4098)).thenReturn(res); @@ -341,13 +356,14 @@ public class ProcessInstanceServiceTest { @Test public void testParseLogForDependentResult() throws IOException { - String logString = "[INFO] 2019-03-19 17:11:08.475 org.apache.dolphinscheduler.server.worker.log.TaskLogger:[172]" - + " - [taskAppId=TASK_223_10739_452334] dependent item complete :|| 223-ALL-day-last1Day,SUCCESS\n" - + "[INFO] 2019-03-19 17:11:08.476 org.apache.dolphinscheduler.server.worker.runner.TaskScheduleThread:[172]" - + " - task : 223_10739_452334 exit status code : 0\n" - + "[root@node2 current]# "; + String logString = + "[INFO] 2019-03-19 17:11:08.475 org.apache.dolphinscheduler.server.worker.log.TaskLogger:[172]" + + " - [taskAppId=TASK_223_10739_452334] dependent item complete :|| 223-ALL-day-last1Day,SUCCESS\n" + + "[INFO] 2019-03-19 17:11:08.476 org.apache.dolphinscheduler.server.worker.runner.TaskScheduleThread:[172]" + + " - task : 223_10739_452334 exit status code : 0\n" + + "[root@node2 current]# "; Map resultMap = - processInstanceService.parseLogForDependentResult(logString); + processInstanceService.parseLogForDependentResult(logString); Assert.assertEquals(1, resultMap.size()); } @@ -359,21 +375,23 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); - Map proejctAuthFailRes = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); + Map proejctAuthFailRes = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //task null + // task null putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(processService.findTaskInstanceById(1)).thenReturn(null); - Map taskNullRes = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); + Map taskNullRes = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); Assert.assertEquals(Status.TASK_INSTANCE_NOT_EXISTS, taskNullRes.get(Constants.STATUS)); - //task not sub process + // task not sub process TaskInstance taskInstance = getTaskInstance(); taskInstance.setTaskType("HTTP"); taskInstance.setProcessInstanceId(1); @@ -382,24 +400,28 @@ public class ProcessInstanceServiceTest { TaskDefinition taskDefinition = new TaskDefinition(); taskDefinition.setProjectCode(projectCode); when(taskDefinitionMapper.queryByCode(taskInstance.getTaskCode())).thenReturn(taskDefinition); - Map notSubprocessRes = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); + Map notSubprocessRes = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); Assert.assertEquals(Status.TASK_INSTANCE_NOT_SUB_WORKFLOW_INSTANCE, notSubprocessRes.get(Constants.STATUS)); - //sub process not exist + // sub process not exist TaskInstance subTask = getTaskInstance(); subTask.setTaskType("SUB_PROCESS"); subTask.setProcessInstanceId(1); putMsg(result, Status.SUCCESS, projectCode); when(processService.findTaskInstanceById(subTask.getId())).thenReturn(subTask); when(processService.findSubProcessInstance(subTask.getProcessInstanceId(), subTask.getId())).thenReturn(null); - Map subprocessNotExistRes = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); + Map subprocessNotExistRes = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); Assert.assertEquals(Status.SUB_PROCESS_INSTANCE_NOT_EXIST, subprocessNotExistRes.get(Constants.STATUS)); - //sub process exist + // sub process exist ProcessInstance processInstance = getProcessInstance(); putMsg(result, Status.SUCCESS, projectCode); - when(processService.findSubProcessInstance(taskInstance.getProcessInstanceId(), taskInstance.getId())).thenReturn(processInstance); - Map subprocessExistRes = processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); + when(processService.findSubProcessInstance(taskInstance.getProcessInstanceId(), taskInstance.getId())) + .thenReturn(processInstance); + Map subprocessExistRes = + processInstanceService.querySubProcessInstanceByTaskId(loginUser, projectCode, 1); Assert.assertEquals(Status.SUCCESS, subprocessExistRes.get(Constants.STATUS)); } @@ -411,33 +433,36 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,INSTANCE_UPDATE )).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_UPDATE)).thenReturn(result); Map proejctAuthFailRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, taskJson, "2020-02-21 00:00:00", true, "", "", 0, ""); + shellJson, taskJson, "2020-02-21 00:00:00", true, "", "", 0, ""); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //process instance null + // process instance null putMsg(result, Status.SUCCESS, projectCode); ProcessInstance processInstance = getProcessInstance(); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,INSTANCE_UPDATE )).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_UPDATE)).thenReturn(result); when(processService.findProcessInstanceDetailById(1)).thenReturn(null); - Map processInstanceNullRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, taskJson,"2020-02-21 00:00:00", true, "", "", 0, ""); + Map processInstanceNullRes = + processInstanceService.updateProcessInstance(loginUser, projectCode, 1, + shellJson, taskJson, "2020-02-21 00:00:00", true, "", "", 0, ""); Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceNullRes.get(Constants.STATUS)); - //process instance not finish + // process instance not finish when(processService.findProcessInstanceDetailById(1)).thenReturn(processInstance); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); putMsg(result, Status.SUCCESS, projectCode); - Map processInstanceNotFinishRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - shellJson, taskJson,"2020-02-21 00:00:00", true, "", "", 0, ""); - Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstanceNotFinishRes.get(Constants.STATUS)); + Map processInstanceNotFinishRes = + processInstanceService.updateProcessInstance(loginUser, projectCode, 1, + shellJson, taskJson, "2020-02-21 00:00:00", true, "", "", 0, ""); + Assert.assertEquals(Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, + processInstanceNotFinishRes.get(Constants.STATUS)); - //process instance finish - processInstance.setState(ExecutionStatus.SUCCESS); + // process instance finish + processInstance.setState(WorkflowExecutionStatus.SUCCESS); processInstance.setTimeout(3000); processInstance.setCommandType(CommandType.STOP); processInstance.setProcessDefinitionCode(46L); @@ -457,17 +482,19 @@ public class ProcessInstanceServiceTest { when(processDefinitionService.checkProcessNodeList(taskRelationJson, taskDefinitionLogs)).thenReturn(result); putMsg(result, Status.SUCCESS, projectCode); when(taskPluginManager.checkTaskParameters(Mockito.any())).thenReturn(true); - Map processInstanceFinishRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - taskRelationJson, taskDefinitionJson,"2020-02-21 00:00:00", true, "", "", 0, "root"); + Map processInstanceFinishRes = + processInstanceService.updateProcessInstance(loginUser, projectCode, 1, + taskRelationJson, taskDefinitionJson, "2020-02-21 00:00:00", true, "", "", 0, "root"); Assert.assertEquals(Status.SUCCESS, processInstanceFinishRes.get(Constants.STATUS)); - //success + // success when(processDefineMapper.queryByCode(46L)).thenReturn(processDefinition); putMsg(result, Status.SUCCESS, projectCode); - when(processService.saveProcessDefine(loginUser, processDefinition, Boolean.FALSE, Boolean.FALSE)).thenReturn(1); + when(processService.saveProcessDefine(loginUser, processDefinition, Boolean.FALSE, Boolean.FALSE)) + .thenReturn(1); Map successRes = processInstanceService.updateProcessInstance(loginUser, projectCode, 1, - taskRelationJson, taskDefinitionJson,"2020-02-21 00:00:00", Boolean.FALSE, "", "", 0, "root"); + taskRelationJson, taskDefinitionJson, "2020-02-21 00:00:00", Boolean.FALSE, "", "", 0, "root"); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); } @@ -479,36 +506,40 @@ public class ProcessInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); - Map proejctAuthFailRes = processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); + Map proejctAuthFailRes = + processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); Assert.assertEquals(Status.PROJECT_NOT_FOUND, proejctAuthFailRes.get(Constants.STATUS)); - //process instance null + // process instance null putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,WORKFLOW_INSTANCE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result); when(processService.findProcessInstanceDetailById(1)).thenReturn(null); - Map processInstanceNullRes = processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); + Map processInstanceNullRes = + processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceNullRes.get(Constants.STATUS)); - //not sub process + // not sub process ProcessInstance processInstance = getProcessInstance(); processInstance.setIsSubProcess(Flag.NO); putMsg(result, Status.SUCCESS, projectCode); when(processService.findProcessInstanceDetailById(1)).thenReturn(processInstance); - Map notSubProcessRes = processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); + Map notSubProcessRes = + processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_SUB_PROCESS_INSTANCE, notSubProcessRes.get(Constants.STATUS)); - //sub process + // sub process processInstance.setIsSubProcess(Flag.YES); putMsg(result, Status.SUCCESS, projectCode); when(processService.findParentProcessInstance(1)).thenReturn(null); - Map subProcessNullRes = processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); + Map subProcessNullRes = + processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); Assert.assertEquals(Status.SUB_PROCESS_INSTANCE_NOT_EXIST, subProcessNullRes.get(Constants.STATUS)); - //success + // success putMsg(result, Status.SUCCESS, projectCode); when(processService.findParentProcessInstance(1)).thenReturn(processInstance); Map successRes = processInstanceService.queryParentInstanceBySubId(loginUser, projectCode, 1); @@ -522,22 +553,22 @@ public class ProcessInstanceServiceTest { Project project = getProject(projectCode); Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //process instance null + // process instance null putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(loginUser, project, projectCode,INSTANCE_DELETE)).thenReturn(result); + when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE)).thenReturn(result); when(processService.findProcessInstanceDetailById(1)).thenReturn(null); } @Test public void testViewVariables() { - //process instance not null + // process instance not null ProcessInstance processInstance = getProcessInstance(); processInstance.setCommandType(CommandType.SCHEDULER); processInstance.setScheduleTime(new Date()); processInstance.setGlobalParams(""); when(processInstanceMapper.queryDetailById(1)).thenReturn(processInstance); - Map successRes = processInstanceService.viewVariables(1L,1); + Map successRes = processInstanceService.viewVariables(1L, 1); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); } @@ -545,13 +576,12 @@ public class ProcessInstanceServiceTest { public void testViewGantt() throws Exception { ProcessInstance processInstance = getProcessInstance(); TaskInstance taskInstance = getTaskInstance(); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); when(processInstanceMapper.queryDetailById(1)).thenReturn(processInstance); when(processDefinitionLogMapper.queryByDefinitionCodeAndVersion( - processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion() - )).thenReturn(new ProcessDefinitionLog()); + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion())).thenReturn(new ProcessDefinitionLog()); when(processInstanceMapper.queryDetailById(1)).thenReturn(processInstance); when(taskInstanceMapper.queryByInstanceIdAndName(Mockito.anyInt(), Mockito.any())).thenReturn(taskInstance); DAG graph = new DAG<>(); @@ -560,7 +590,7 @@ public class ProcessInstanceServiceTest { } when(processService.genDagGraph(Mockito.any(ProcessDefinition.class))) - .thenReturn(graph); + .thenReturn(graph); Map successRes = processInstanceService.viewGantt(0L, 1); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java index 0ce57acf13..c748838bfc 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java @@ -40,7 +40,7 @@ import org.apache.dolphinscheduler.dao.entity.User; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.service.process.ProcessService; import java.text.MessageFormat; @@ -97,22 +97,22 @@ public class TaskInstanceServiceTest { Map result = new HashMap<>(); putMsg(result, Status.PROJECT_NOT_FOUND, projectCode); - //project auth fail + // project auth fail when(projectMapper.queryByCode(projectCode)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectCode, TASK_INSTANCE)).thenReturn(result); Result projectAuthFailRes = taskInstanceService.queryTaskListPaging(loginUser, - projectCode, - 0, - "", - "", - "test_user", - "2019-02-26 19:48:00", - "2019-02-26 19:48:22", - "", - null, - "", - 1, - 20); + projectCode, + 0, + "", + "", + "test_user", + "2019-02-26 19:48:00", + "2019-02-26 19:48:22", + "", + null, + "", + 1, + 20); Assert.assertEquals(Status.PROJECT_NOT_FOUND.getCode(), (int) projectAuthFailRes.getCode()); // data parameter check @@ -120,21 +120,21 @@ public class TaskInstanceServiceTest { when(projectMapper.queryByCode(projectCode)).thenReturn(project); when(projectService.checkProjectAndAuth(loginUser, project, projectCode, TASK_INSTANCE)).thenReturn(result); Result dataParameterRes = taskInstanceService.queryTaskListPaging(loginUser, - projectCode, - 1, - "", - "", - "test_user", - "20200101 00:00:00", - "2020-01-02 00:00:00", - "", - ExecutionStatus.SUCCESS, - "192.168.xx.xx", - 1, - 20); + projectCode, + 1, + "", + "", + "test_user", + "20200101 00:00:00", + "2020-01-02 00:00:00", + "", + TaskExecutionStatus.SUCCESS, + "192.168.xx.xx", + 1, + 20); Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int) dataParameterRes.getCode()); - //project + // project putMsg(result, Status.SUCCESS, projectCode); Date start = DateUtils.stringToDate("2020-01-01 00:00:00"); Date end = DateUtils.stringToDate("2020-01-02 00:00:00"); @@ -148,46 +148,54 @@ public class TaskInstanceServiceTest { when(projectService.checkProjectAndAuth(loginUser, project, projectCode, TASK_INSTANCE)).thenReturn(result); when(usersService.queryUser(loginUser.getId())).thenReturn(loginUser); when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(loginUser.getId()); - when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), eq(""), eq(""), eq(""), + when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), + eq(""), eq(""), eq(""), eq(0), Mockito.any(), eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); when(usersService.queryUser(processInstance.getExecutorId())).thenReturn(loginUser); - when(processService.findProcessInstanceDetailById(taskInstance.getProcessInstanceId())).thenReturn(processInstance); + when(processService.findProcessInstanceDetailById(taskInstance.getProcessInstanceId())) + .thenReturn(processInstance); Result successRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "test_user", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)successRes.getCode()); + "test_user", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", TaskExecutionStatus.SUCCESS, + "192.168.xx.xx", 1, 20); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) successRes.getCode()); - //executor name empty - when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), eq(""), eq(""), eq(""), + // executor name empty + when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), + eq(""), eq(""), eq(""), eq(0), Mockito.any(), eq("192.168.xx.xx"), eq(start), eq(end))).thenReturn(pageReturn); Result executorEmptyRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.SUCCESS.getCode(), (int)executorEmptyRes.getCode()); + "", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", TaskExecutionStatus.SUCCESS, "192.168.xx.xx", 1, + 20); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) executorEmptyRes.getCode()); - //executor null + // executor null when(usersService.queryUser(loginUser.getId())).thenReturn(null); when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(-1); Result executorNullRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "test_user", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.SUCCESS.getCode(),(int)executorNullRes.getCode()); + "test_user", "2020-01-01 00:00:00", "2020-01-02 00:00:00", "", TaskExecutionStatus.SUCCESS, + "192.168.xx.xx", 1, 20); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) executorNullRes.getCode()); - //start/end date null - when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), eq(""), eq(""), eq(""), + // start/end date null + when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), + eq(""), eq(""), eq(""), eq(0), Mockito.any(), eq("192.168.xx.xx"), any(), any())).thenReturn(pageReturn); Result executorNullDateRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "", null, null, "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.SUCCESS.getCode(),(int) executorNullDateRes.getCode()); + "", null, null, "", TaskExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); + Assert.assertEquals(Status.SUCCESS.getCode(), (int) executorNullDateRes.getCode()); - //start date error format - when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), eq(""), eq(""), eq(""), + // start date error format + when(taskInstanceMapper.queryTaskInstanceListPaging(Mockito.any(Page.class), eq(project.getCode()), eq(1), + eq(""), eq(""), eq(""), eq(0), Mockito.any(), eq("192.168.xx.xx"), any(), any())).thenReturn(pageReturn); Result executorErrorStartDateRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "", "error date", null, "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int)executorErrorStartDateRes.getCode()); + "", "error date", null, "", TaskExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); + Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int) executorErrorStartDateRes.getCode()); Result executorErrorEndDateRes = taskInstanceService.queryTaskListPaging(loginUser, projectCode, 1, "", "", - "", null, "error date", "", ExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); - Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int)executorErrorEndDateRes.getCode()); + "", null, "error date", "", TaskExecutionStatus.SUCCESS, "192.168.xx.xx", 1, 20); + Assert.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), (int) executorErrorEndDateRes.getCode()); } /** @@ -272,12 +280,12 @@ public class TaskInstanceServiceTest { // user auth failed Map mockFailure = new HashMap<>(5); putMsg(mockFailure, Status.USER_NO_OPERATION_PROJECT_PERM, user.getUserName(), projectCode); - when(projectService.checkProjectAndAuth(user, project, projectCode,FORCED_SUCCESS)).thenReturn(mockFailure); + when(projectService.checkProjectAndAuth(user, project, projectCode, FORCED_SUCCESS)).thenReturn(mockFailure); Map authFailRes = taskInstanceService.forceTaskSuccess(user, projectCode, taskId); Assert.assertNotSame(Status.SUCCESS, authFailRes.get(Constants.STATUS)); // test task not found - when(projectService.checkProjectAndAuth(user, project, projectCode,FORCED_SUCCESS)).thenReturn(mockSuccess); + when(projectService.checkProjectAndAuth(user, project, projectCode, FORCED_SUCCESS)).thenReturn(mockSuccess); when(taskInstanceMapper.selectById(Mockito.anyInt())).thenReturn(null); TaskDefinition taskDefinition = new TaskDefinition(); taskDefinition.setProjectCode(projectCode); @@ -286,30 +294,30 @@ public class TaskInstanceServiceTest { Assert.assertEquals(Status.TASK_INSTANCE_NOT_FOUND, taskNotFoundRes.get(Constants.STATUS)); // test task instance state error - task.setState(ExecutionStatus.SUCCESS); + task.setState(TaskExecutionStatus.SUCCESS); when(taskInstanceMapper.selectById(1)).thenReturn(task); Map result = new HashMap<>(); putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(user, project, projectCode,FORCED_SUCCESS)).thenReturn(result); + when(projectService.checkProjectAndAuth(user, project, projectCode, FORCED_SUCCESS)).thenReturn(result); Map taskStateErrorRes = taskInstanceService.forceTaskSuccess(user, projectCode, taskId); Assert.assertEquals(Status.TASK_INSTANCE_STATE_OPERATION_ERROR, taskStateErrorRes.get(Constants.STATUS)); // test error - task.setState(ExecutionStatus.FAILURE); + task.setState(TaskExecutionStatus.FAILURE); when(taskInstanceMapper.updateById(task)).thenReturn(0); putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(user, project, projectCode,FORCED_SUCCESS)).thenReturn(result); + when(projectService.checkProjectAndAuth(user, project, projectCode, FORCED_SUCCESS)).thenReturn(result); Map errorRes = taskInstanceService.forceTaskSuccess(user, projectCode, taskId); Assert.assertEquals(Status.FORCE_TASK_SUCCESS_ERROR, errorRes.get(Constants.STATUS)); // test success - task.setState(ExecutionStatus.FAILURE); + task.setState(TaskExecutionStatus.FAILURE); when(taskInstanceMapper.updateById(task)).thenReturn(1); putMsg(result, Status.SUCCESS, projectCode); when(projectMapper.queryByCode(projectCode)).thenReturn(project); - when(projectService.checkProjectAndAuth(user, project, projectCode,FORCED_SUCCESS)).thenReturn(result); + when(projectService.checkProjectAndAuth(user, project, projectCode, FORCED_SUCCESS)).thenReturn(result); Map successRes = taskInstanceService.forceTaskSuccess(user, projectCode, taskId); Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS)); } diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java index 70f7748f96..9faf69c70a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java @@ -17,10 +17,10 @@ package org.apache.dolphinscheduler.common; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import java.time.Duration; import java.util.regex.Pattern; @@ -49,7 +49,8 @@ public final class Constants { public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_MASTERS = "/lock/masters"; public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS = "/lock/failover/masters"; public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS = "/lock/failover/workers"; - public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS = "/lock/failover/startup-masters"; + public static final String REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS = + "/lock/failover/startup-masters"; public static final String FORMAT_SS = "%s%s"; public static final String FORMAT_S_S = "%s/%s"; @@ -71,7 +72,6 @@ public final class Constants { */ public static final String FS_DEFAULT_FS = "resource.hdfs.fs.defaultFS"; - /** * hadoop configuration */ @@ -84,7 +84,6 @@ public final class Constants { */ public static final String YARN_RESOURCEMANAGER_HA_RM_IDS = "yarn.resourcemanager.ha.rm.ids"; - /** * yarn.application.status.address */ @@ -127,7 +126,8 @@ public final class Constants { */ public static final String RESOURCE_VIEW_SUFFIXES = "resource.view.suffixs"; - public static final String RESOURCE_VIEW_SUFFIXES_DEFAULT_VALUE = "txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js"; + public static final String RESOURCE_VIEW_SUFFIXES_DEFAULT_VALUE = + "txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js"; /** * development.state @@ -224,7 +224,6 @@ public final class Constants { */ public static final int HTTP_CONNECT_TIMEOUT = 60 * 1000; - /** * http connect request time out */ @@ -270,13 +269,11 @@ public final class Constants { */ public static final int READ_PERMISSION = 2; - /** * write permission */ public static final int WRITE_PERMISSION = 2 * 2; - /** * execute permission */ @@ -292,7 +289,6 @@ public final class Constants { */ public static final int DEFAULT_HASH_MAP_SIZE = 16; - /** * all permissions */ @@ -583,7 +579,6 @@ public final class Constants { public static final String DEPENDENT_SPLIT = ":||"; public static final long DEPENDENT_ALL_TASK_CODE = 0; - /** * preview schedule execute count */ @@ -617,7 +612,8 @@ public final class Constants { /** * hadoop.security.authentication */ - public static final String HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE = "hadoop.security.authentication.startup.state"; + public static final String HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE = + "hadoop.security.authentication.startup.state"; /** * com.amazonaws.services.s3.enableV4 @@ -642,23 +638,21 @@ public final class Constants { */ public static final String TASK_LOG_INFO_FORMAT = "TaskLogInfo-%s"; - public static final int[] NOT_TERMINATED_STATES = new int[] { - ExecutionStatus.SUBMITTED_SUCCESS.ordinal(), - ExecutionStatus.DISPATCH.ordinal(), - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.DELAY_EXECUTION.ordinal(), - ExecutionStatus.READY_PAUSE.ordinal(), - ExecutionStatus.READY_STOP.ordinal(), - ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(), - ExecutionStatus.WAITING_THREAD.ordinal(), - ExecutionStatus.WAITING_DEPEND.ordinal() + public static final int[] NOT_TERMINATED_STATES = new int[]{ + WorkflowExecutionStatus.SUBMITTED_SUCCESS.ordinal(), + TaskExecutionStatus.DISPATCH.ordinal(), + WorkflowExecutionStatus.RUNNING_EXECUTION.ordinal(), + WorkflowExecutionStatus.DELAY_EXECUTION.ordinal(), + WorkflowExecutionStatus.READY_PAUSE.ordinal(), + WorkflowExecutionStatus.READY_STOP.ordinal(), + TaskExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(), }; - public static final int[] RUNNING_PROCESS_STATE = new int[] { - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.SUBMITTED_SUCCESS.ordinal(), - ExecutionStatus.DISPATCH.ordinal(), - ExecutionStatus.SERIAL_WAIT.ordinal() + public static final int[] RUNNING_PROCESS_STATE = new int[]{ + TaskExecutionStatus.RUNNING_EXECUTION.ordinal(), + TaskExecutionStatus.SUBMITTED_SUCCESS.ordinal(), + TaskExecutionStatus.DISPATCH.ordinal(), + WorkflowExecutionStatus.SERIAL_WAIT.ordinal() }; /** @@ -686,7 +680,6 @@ public final class Constants { */ public static final String PAGE_NUMBER = "pageNo"; - /** * */ @@ -741,7 +734,8 @@ public final class Constants { /** * dataSource sensitive param */ - public static final String DATASOURCE_PASSWORD_REGEX = "(?<=((?i)password((\\\\\":\\\\\")|(=')))).*?(?=((\\\\\")|(')))"; + public static final String DATASOURCE_PASSWORD_REGEX = + "(?<=((?i)password((\\\\\":\\\\\")|(=')))).*?(?=((\\\\\")|(')))"; /** * default worker group @@ -779,12 +773,14 @@ public final class Constants { /** * network interface preferred */ - public static final String DOLPHIN_SCHEDULER_NETWORK_INTERFACE_PREFERRED = "dolphin.scheduler.network.interface.preferred"; + public static final String DOLPHIN_SCHEDULER_NETWORK_INTERFACE_PREFERRED = + "dolphin.scheduler.network.interface.preferred"; /** * network IP gets priority, default inner outer */ - public static final String DOLPHIN_SCHEDULER_NETWORK_PRIORITY_STRATEGY = "dolphin.scheduler.network.priority.strategy"; + public static final String DOLPHIN_SCHEDULER_NETWORK_PRIORITY_STRATEGY = + "dolphin.scheduler.network.priority.strategy"; /** * exec shell scripts @@ -796,7 +792,8 @@ public final class Constants { */ public static final String PSTREE = "pstree"; - public static final boolean KUBERNETES_MODE = !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_HOST")) && !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_PORT")); + public static final boolean KUBERNETES_MODE = !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_HOST")) + && !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_PORT")); /** * dry run flag diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java deleted file mode 100644 index 482cc658aa..0000000000 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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.apache.dolphinscheduler.common.enums; - -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; - -/** - * type of task state - */ -public enum TaskStateType { - /** - * 0 waiting running - * 1 running - * 2 finish - * 3 failed - * 4 success - */ - WAITTING, RUNNING, FINISH, FAILED, SUCCESS; - - /** - * convert task state to execute status integer array ; - * - * @param taskStateType task state type - * @return result of execution status - */ - public static int[] convert2ExecutStatusIntArray(TaskStateType taskStateType) { - - switch (taskStateType) { - case SUCCESS: - return new int[]{ExecutionStatus.SUCCESS.ordinal()}; - case FAILED: - return new int[]{ - ExecutionStatus.FAILURE.ordinal(), - ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal()}; - case FINISH: - return new int[]{ - ExecutionStatus.PAUSE.ordinal(), - ExecutionStatus.STOP.ordinal() - }; - case RUNNING: - return new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(), - ExecutionStatus.DISPATCH.ordinal(), - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.DELAY_EXECUTION.ordinal(), - ExecutionStatus.READY_PAUSE.ordinal(), - ExecutionStatus.READY_STOP.ordinal()}; - case WAITTING: - return new int[]{ - ExecutionStatus.SUBMITTED_SUCCESS.ordinal() - }; - default: - break; - } - return new int[0]; - } - -} diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java new file mode 100644 index 0000000000..67be58c7e6 --- /dev/null +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java @@ -0,0 +1,134 @@ +/* + * 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.apache.dolphinscheduler.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.NonNull; + +import java.util.HashMap; +import java.util.Map; + +public enum WorkflowExecutionStatus { + // This class is split from ExecutionStatus #11339. + // In order to compatible with the old value, the code is not consecutive + SUBMITTED_SUCCESS(0, "submit success"), + RUNNING_EXECUTION(1, "running"), + READY_PAUSE(2, "ready pause"), + PAUSE(3, "pause"), + READY_STOP(4, "ready stop"), + STOP(5, "stop"), + FAILURE(6, "failure"), + SUCCESS(7, "success"), + DELAY_EXECUTION(12, "delay execution"), + SERIAL_WAIT(14, "serial wait"), + READY_BLOCK(15, "ready block"), + BLOCK(16, "block"), + ; + + private static final Map CODE_MAP = new HashMap<>(); + private static final int[] NEED_FAILOVER_STATES = new int[]{ + SUBMITTED_SUCCESS.getCode(), + RUNNING_EXECUTION.getCode(), + DELAY_EXECUTION.getCode(), + READY_PAUSE.getCode(), + READY_STOP.getCode() + }; + + static { + for (WorkflowExecutionStatus executionStatus : WorkflowExecutionStatus.values()) { + CODE_MAP.put(executionStatus.getCode(), executionStatus); + } + } + + /** + * Get WorkflowExecutionStatus by code, if the code is invalidated will throw {@link IllegalArgumentException}. + */ + public static @NonNull WorkflowExecutionStatus of(int code) { + WorkflowExecutionStatus workflowExecutionStatus = CODE_MAP.get(code); + if (workflowExecutionStatus == null) { + throw new IllegalArgumentException(String.format("The workflow execution status code: %s is invalidated", + code)); + } + return workflowExecutionStatus; + } + + public boolean isRunning() { + return this == RUNNING_EXECUTION; + } + + public boolean isFinished() { + // todo: do we need to remove pause/block in finished judge? + return isSuccess() || isFailure() || isStop() || isPause() || isBlock(); + } + + /** + * status is success + * + * @return status + */ + public boolean isSuccess() { + return this == SUCCESS; + } + + public boolean isFailure() { + return this == FAILURE; + } + + public boolean isPause() { + return this == PAUSE; + } + + public boolean isReadyStop() { + return this == READY_STOP; + } + + public boolean isStop() { + return this == STOP; + } + + public boolean isBlock() { + return this == BLOCK; + } + + public static int[] getNeedFailoverWorkflowInstanceState() { + return NEED_FAILOVER_STATES; + } + + @EnumValue + private final int code; + + private final String desc; + + WorkflowExecutionStatus(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } + + @Override + public String toString() { + return "WorkflowExecutionStatus{" + "code=" + code + ", desc='" + desc + '\'' + '}'; + } +} diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java index b1ad942ac2..8d7e4c2a6b 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java @@ -26,7 +26,7 @@ import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.ResUploadType; import org.apache.dolphinscheduler.common.exception.BaseException; import org.apache.dolphinscheduler.common.storage.StorageOperate; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.spi.enums.ResourceType; import org.apache.commons.io.IOUtils; @@ -74,13 +74,15 @@ public class HadoopUtils implements Closeable, StorageOperate { public static final String RM_HA_IDS = PropertyUtils.getString(Constants.YARN_RESOURCEMANAGER_HA_RM_IDS); public static final String APP_ADDRESS = PropertyUtils.getString(Constants.YARN_APPLICATION_STATUS_ADDRESS); public static final String JOB_HISTORY_ADDRESS = PropertyUtils.getString(Constants.YARN_JOB_HISTORY_STATUS_ADDRESS); - public static final int HADOOP_RESOURCE_MANAGER_HTTP_ADDRESS_PORT_VALUE = PropertyUtils.getInt(Constants.HADOOP_RESOURCE_MANAGER_HTTPADDRESS_PORT, 8088); + public static final int HADOOP_RESOURCE_MANAGER_HTTP_ADDRESS_PORT_VALUE = + PropertyUtils.getInt(Constants.HADOOP_RESOURCE_MANAGER_HTTPADDRESS_PORT, 8088); private static final String HADOOP_UTILS_KEY = "HADOOP_UTILS_KEY"; private static final LoadingCache cache = CacheBuilder .newBuilder() .expireAfterWrite(PropertyUtils.getInt(Constants.KERBEROS_EXPIRE_TIME, 2), TimeUnit.HOURS) .build(new CacheLoader() { + @Override public HadoopUtils load(String key) throws Exception { return new HadoopUtils(); @@ -134,7 +136,7 @@ public class HadoopUtils implements Closeable, StorageOperate { defaultFS = PropertyUtils.getString(Constants.FS_DEFAULT_FS); } - //first get key from core-site.xml hdfs-site.xml ,if null ,then try to get from properties file + // first get key from core-site.xml hdfs-site.xml ,if null ,then try to get from properties file // the default is the local file system if (StringUtils.isNotBlank(defaultFS)) { Map fsRelatedProps = PropertyUtils.getPrefixedProperties("fs."); @@ -143,12 +145,12 @@ public class HadoopUtils implements Closeable, StorageOperate { } else { logger.error("property:{} can not to be empty, please set!", Constants.FS_DEFAULT_FS); throw new NullPointerException( - String.format("property: %s can not to be empty, please set!", Constants.FS_DEFAULT_FS) - ); + String.format("property: %s can not to be empty, please set!", Constants.FS_DEFAULT_FS)); } if (!defaultFS.startsWith("file")) { - logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", Constants.FS_DEFAULT_FS, defaultFS); + logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", Constants.FS_DEFAULT_FS, + defaultFS); } if (StringUtils.isNotEmpty(hdfsUser)) { @@ -203,7 +205,7 @@ public class HadoopUtils implements Closeable, StorageOperate { } public String getJobHistoryUrl(String applicationId) { - //eg:application_1587475402360_712719 -> job_1587475402360_712719 + // eg:application_1587475402360_712719 -> job_1587475402360_712719 String jobId = applicationId.replace("application", "job"); return String.format(JOB_HISTORY_ADDRESS, jobId); } @@ -251,7 +253,8 @@ public class HadoopUtils implements Closeable, StorageOperate { } @Override - public List vimFile(String bucketName, String hdfsFilePath, int skipLineNums, int limit) throws IOException { + public List vimFile(String bucketName, String hdfsFilePath, int skipLineNums, + int limit) throws IOException { return catFile(hdfsFilePath, skipLineNums, limit); } @@ -296,7 +299,8 @@ public class HadoopUtils implements Closeable, StorageOperate { } @Override - public void download(String bucketName, String srcHdfsFilePath, String dstFile, boolean deleteSource, boolean overwrite) throws IOException { + public void download(String bucketName, String srcHdfsFilePath, String dstFile, boolean deleteSource, + boolean overwrite) throws IOException { copyHdfsToLocal(srcHdfsFilePath, dstFile, deleteSource, overwrite); } @@ -326,7 +330,8 @@ public class HadoopUtils implements Closeable, StorageOperate { * @return if success or not * @throws IOException errors */ - public boolean copyLocalToHdfs(String srcFile, String dstHdfsPath, boolean deleteSource, boolean overwrite) throws IOException { + public boolean copyLocalToHdfs(String srcFile, String dstHdfsPath, boolean deleteSource, + boolean overwrite) throws IOException { Path srcPath = new Path(srcFile); Path dstPath = new Path(dstHdfsPath); @@ -336,7 +341,8 @@ public class HadoopUtils implements Closeable, StorageOperate { } @Override - public boolean upload(String buckName, String srcFile, String dstPath, boolean deleteSource, boolean overwrite) throws IOException { + public boolean upload(String buckName, String srcFile, String dstPath, boolean deleteSource, + boolean overwrite) throws IOException { return copyLocalToHdfs(srcFile, dstPath, deleteSource, overwrite); } @@ -344,13 +350,19 @@ public class HadoopUtils implements Closeable, StorageOperate { * copy hdfs file to local * * @param srcHdfsFilePath source hdfs file path - * @param dstFile destination file - * @param deleteSource delete source - * @param overwrite overwrite + * + * @param dstFile destination file + * + * @param deleteSource delete source + * + * @param overwrite overwrite + * * @return result of copy hdfs file to local + * * @throws IOException errors */ - public boolean copyHdfsToLocal(String srcHdfsFilePath, String dstFile, boolean deleteSource, boolean overwrite) throws IOException { + public boolean copyHdfsToLocal(String srcHdfsFilePath, String dstFile, boolean deleteSource, + boolean overwrite) throws IOException { Path srcPath = new Path(srcHdfsFilePath); File dstPath = new File(dstFile); @@ -442,7 +454,7 @@ public class HadoopUtils implements Closeable, StorageOperate { * @param applicationId application id * @return the return may be null or there may be other parse exceptions */ - public ExecutionStatus getApplicationStatus(String applicationId) throws BaseException { + public TaskExecutionStatus getApplicationStatus(String applicationId) throws BaseException { if (StringUtils.isEmpty(applicationId)) { return null; } @@ -451,51 +463,57 @@ public class HadoopUtils implements Closeable, StorageOperate { String applicationUrl = getApplicationUrl(applicationId); logger.debug("generate yarn application url, applicationUrl={}", applicationUrl); - String responseContent = Boolean.TRUE.equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) ? KerberosHttpClient.get(applicationUrl) : HttpUtils.get(applicationUrl); + String responseContent = Boolean.TRUE + .equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) + ? KerberosHttpClient.get(applicationUrl) + : HttpUtils.get(applicationUrl); if (responseContent != null) { ObjectNode jsonObject = JSONUtils.parseObject(responseContent); if (!jsonObject.has("app")) { - return ExecutionStatus.FAILURE; + return TaskExecutionStatus.FAILURE; } result = jsonObject.path("app").path("finalStatus").asText(); } else { - //may be in job history + // may be in job history String jobHistoryUrl = getJobHistoryUrl(applicationId); logger.debug("generate yarn job history application url, jobHistoryUrl={}", jobHistoryUrl); - responseContent = Boolean.TRUE.equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) ? KerberosHttpClient.get(jobHistoryUrl) : HttpUtils.get(jobHistoryUrl); + responseContent = Boolean.TRUE + .equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) + ? KerberosHttpClient.get(jobHistoryUrl) + : HttpUtils.get(jobHistoryUrl); if (null != responseContent) { ObjectNode jsonObject = JSONUtils.parseObject(responseContent); if (!jsonObject.has("job")) { - return ExecutionStatus.FAILURE; + return TaskExecutionStatus.FAILURE; } result = jsonObject.path("job").path("state").asText(); } else { - return ExecutionStatus.FAILURE; + return TaskExecutionStatus.FAILURE; } } return getExecutionStatus(result); } - private ExecutionStatus getExecutionStatus(String result) { + private TaskExecutionStatus getExecutionStatus(String result) { switch (result) { case Constants.ACCEPTED: - return ExecutionStatus.SUBMITTED_SUCCESS; + return TaskExecutionStatus.SUBMITTED_SUCCESS; case Constants.SUCCEEDED: case Constants.ENDED: - return ExecutionStatus.SUCCESS; + return TaskExecutionStatus.SUCCESS; case Constants.NEW: case Constants.NEW_SAVING: case Constants.SUBMITTED: case Constants.FAILED: - return ExecutionStatus.FAILURE; + return TaskExecutionStatus.FAILURE; case Constants.KILLED: - return ExecutionStatus.KILL; + return TaskExecutionStatus.KILL; case Constants.RUNNING: default: - return ExecutionStatus.RUNNING_EXECUTION; + return TaskExecutionStatus.RUNNING_EXECUTION; } } @@ -534,7 +552,6 @@ public class HadoopUtils implements Closeable, StorageOperate { return getHdfsDir(resourceType, tenantCode); } - /** * hdfs resource dir * @@ -615,7 +632,6 @@ public class HadoopUtils implements Closeable, StorageOperate { */ public static String getAppAddress(String appAddress, String rmHa) { - String[] split1 = appAddress.split(Constants.DOUBLE_SLASH); if (split1.length != 2) { @@ -631,7 +647,7 @@ public class HadoopUtils implements Closeable, StorageOperate { String end = Constants.COLON + split2[1]; - //get active ResourceManager + // get active ResourceManager String activeRM = YarnHAAdminUtils.getActiveRMName(start, rmHa); if (StringUtils.isEmpty(activeRM)) { @@ -694,15 +710,18 @@ public class HadoopUtils implements Closeable, StorageOperate { */ public static String getRMState(String url) { - String retStr = Boolean.TRUE.equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) ? KerberosHttpClient.get(url) : HttpUtils.get(url); + String retStr = Boolean.TRUE + .equals(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) + ? KerberosHttpClient.get(url) + : HttpUtils.get(url); if (StringUtils.isEmpty(retStr)) { return null; } - //to json + // to json ObjectNode jsonObject = JSONUtils.parseObject(retStr); - //get ResourceManager state + // get ResourceManager state if (!jsonObject.has("clusterInfo")) { return null; } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java index 018cea4827..d8a6730fb6 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java @@ -109,7 +109,7 @@ public class AlertDao { * @param alert alert * @return sign's str */ - private String generateSign (Alert alert) { + private String generateSign(Alert alert) { return Optional.of(alert) .map(Alert::getContent) .map(DigestUtils::sha1Hex) @@ -144,12 +144,10 @@ public class AlertDao { * @param serverType serverType */ public void sendServerStoppedAlert(int alertGroupId, String host, String serverType) { - ServerAlertContent serverStopAlertContent = ServerAlertContent.newBuilder(). - type(serverType) + ServerAlertContent serverStopAlertContent = ServerAlertContent.newBuilder().type(serverType) .host(host) .event(AlertEvent.SERVER_DOWN) - .warningLevel(AlertWarnLevel.SERIOUS). - build(); + .warningLevel(AlertWarnLevel.SERIOUS).build(); String content = JSONUtils.toJsonString(Lists.newArrayList(serverStopAlertContent)); Alert alert = new Alert(); @@ -164,7 +162,8 @@ public class AlertDao { alert.setSign(generateSign(alert)); // we use this method to avoid insert duplicate alert(issue #5525) // we modified this method to optimize performance(issue #9174) - Date crashAlarmSuppressionStartTime = Date.from(LocalDateTime.now().plusMinutes(-crashAlarmSuppression).atZone(ZoneId.systemDefault()).toInstant()); + Date crashAlarmSuppressionStartTime = Date.from( + LocalDateTime.now().plusMinutes(-crashAlarmSuppression).atZone(ZoneId.systemDefault()).toInstant()); alertMapper.insertAlertWhenServerCrash(alert, crashAlarmSuppressionStartTime); } @@ -178,7 +177,7 @@ public class AlertDao { int alertGroupId = processInstance.getWarningGroupId(); Alert alert = new Alert(); List processAlertContentList = new ArrayList<>(1); - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .projectCode(projectUser.getProjectCode()) .projectName(projectUser.getProjectName()) .owner(projectUser.getUserName()) @@ -191,7 +190,7 @@ public class AlertDao { .processStartTime(processInstance.getStartTime()) .processHost(processInstance.getHost()) .event(AlertEvent.TIME_OUT) - .warningLevel(AlertWarnLevel.MIDDLE) + .warnLevel(AlertWarnLevel.MIDDLE) .build(); processAlertContentList.add(processAlertContent); String content = JSONUtils.toJsonString(processAlertContentList); @@ -221,10 +220,11 @@ public class AlertDao { * @param taskInstance taskInstance * @param projectUser projectUser */ - public void sendTaskTimeoutAlert(ProcessInstance processInstance, TaskInstance taskInstance, ProjectUser projectUser) { + public void sendTaskTimeoutAlert(ProcessInstance processInstance, TaskInstance taskInstance, + ProjectUser projectUser) { Alert alert = new Alert(); List processAlertContentList = new ArrayList<>(1); - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .projectCode(projectUser.getProjectCode()) .projectName(projectUser.getProjectName()) .owner(projectUser.getUserName()) @@ -237,7 +237,7 @@ public class AlertDao { .taskStartTime(taskInstance.getStartTime()) .taskHost(taskInstance.getHost()) .event(AlertEvent.TIME_OUT) - .warningLevel(AlertWarnLevel.MIDDLE) + .warnLevel(AlertWarnLevel.MIDDLE) .build(); processAlertContentList.add(processAlertContent); String content = JSONUtils.toJsonString(processAlertContentList); @@ -254,13 +254,13 @@ public class AlertDao { */ public List listPendingAlerts() { LambdaQueryWrapper wrapper = new QueryWrapper<>(new Alert()).lambda() - .eq(Alert::getAlertStatus, AlertStatus.WAIT_EXECUTION); + .eq(Alert::getAlertStatus, AlertStatus.WAIT_EXECUTION); return alertMapper.selectList(wrapper); } public List listAlerts(int processInstanceId) { LambdaQueryWrapper wrapper = new QueryWrapper<>(new Alert()).lambda() - .eq(Alert::getProcessInstanceId, processInstanceId); + .eq(Alert::getProcessInstanceId, processInstanceId); return alertMapper.selectList(wrapper); } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java index 4452156b55..ffd45e49fa 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java @@ -17,45 +17,23 @@ package org.apache.dolphinscheduler.dao.entity; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; -/** - * count execute state - * - */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ExecuteStatusCount { /** * execution state */ - private ExecutionStatus state; + private TaskExecutionStatus state; /** * count for state */ private int count; - - public ExecutionStatus getExecutionStatus() { - return state; - } - - public void setExecutionStatus(ExecutionStatus executionStatus) { - this.state = executionStatus; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - @Override - public String toString() { - return "ExecuteStatusCount{" - + "state=" + state - + ", count=" + count - + '}'; - } } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java index fc7129a2f6..22dab95234 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessAlertContent.java @@ -17,19 +17,23 @@ package org.apache.dolphinscheduler.dao.entity; -import org.apache.dolphinscheduler.common.enums.AlertEvent; -import org.apache.dolphinscheduler.common.enums.AlertWarnLevel; -import org.apache.dolphinscheduler.common.enums.CommandType; -import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.dolphinscheduler.common.enums.*; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import java.io.Serializable; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonProperty; - +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder @JsonInclude(Include.NON_NULL) public class ProcessAlertContent implements Serializable { @@ -50,7 +54,7 @@ public class ProcessAlertContent implements Serializable { @JsonProperty("processType") private CommandType processType; @JsonProperty("processState") - private ExecutionStatus processState; + private WorkflowExecutionStatus processState; @JsonProperty("recovery") private Flag recovery; @JsonProperty("runTimes") @@ -74,7 +78,7 @@ public class ProcessAlertContent implements Serializable { @JsonProperty("retryTimes") private Integer retryTimes; @JsonProperty("taskState") - private ExecutionStatus taskState; + private TaskExecutionStatus taskState; @JsonProperty("taskStartTime") private Date taskStartTime; @JsonProperty("taskEndTime") @@ -84,193 +88,4 @@ public class ProcessAlertContent implements Serializable { @JsonProperty("logPath") private String logPath; - private ProcessAlertContent(Builder builder) { - this.projectId = builder.projectId; - this.projectCode = builder.projectCode; - this.projectName = builder.projectName; - this.owner = builder.owner; - this.processId = builder.processId; - this.processDefinitionCode = builder.processDefinitionCode; - this.processName = builder.processName; - this.processType = builder.processType; - this.recovery = builder.recovery; - this.processState = builder.processState; - this.runTimes = builder.runTimes; - this.processStartTime = builder.processStartTime; - this.processEndTime = builder.processEndTime; - this.processHost = builder.processHost; - this.taskCode = builder.taskCode; - this.taskName = builder.taskName; - this.event = builder.event; - this.warnLevel = builder.warnLevel; - this.taskType = builder.taskType; - this.taskState = builder.taskState; - this.taskStartTime = builder.taskStartTime; - this.taskEndTime = builder.taskEndTime; - this.taskHost = builder.taskHost; - this.logPath = builder.logPath; - this.retryTimes = builder.retryTimes; - - } - - public static Builder newBuilder() { - return new Builder(); - } - - public static class Builder { - private Integer projectId; - private Long projectCode; - private String projectName; - private String owner; - private Integer processId; - private Long processDefinitionCode; - private String processName; - private CommandType processType; - private Flag recovery; - private ExecutionStatus processState; - private Integer runTimes; - private Date processStartTime; - private Date processEndTime; - private String processHost; - private Long taskCode; - private String taskName; - private AlertEvent event; - private AlertWarnLevel warnLevel; - private String taskType; - private Integer retryTimes; - private ExecutionStatus taskState; - private Date taskStartTime; - private Date taskEndTime; - private String taskHost; - private String logPath; - - public Builder projectId(Integer projectId) { - this.projectId = projectId; - return this; - } - - public Builder projectCode(Long projectCode) { - this.projectCode = projectCode; - return this; - } - - public Builder projectName(String projectName) { - this.projectName = projectName; - return this; - } - - public Builder owner(String owner) { - this.owner = owner; - return this; - } - - public Builder processId(Integer processId) { - this.processId = processId; - return this; - } - - public Builder processDefinitionCode(Long processDefinitionCode) { - this.processDefinitionCode = processDefinitionCode; - return this; - } - - public Builder processName(String processName) { - this.processName = processName; - return this; - } - - public Builder processType(CommandType processType) { - this.processType = processType; - return this; - } - - public Builder recovery(Flag recovery) { - this.recovery = recovery; - return this; - } - - public Builder processState(ExecutionStatus processState) { - this.processState = processState; - return this; - } - - public Builder runTimes(Integer runTimes) { - this.runTimes = runTimes; - return this; - } - - public Builder processStartTime(Date processStartTime) { - this.processStartTime = processStartTime; - return this; - } - - public Builder processEndTime(Date processEndTime) { - this.processEndTime = processEndTime; - return this; - } - - public Builder processHost(String processHost) { - this.processHost = processHost; - return this; - } - - public Builder taskCode(Long taskCode) { - this.taskCode = taskCode; - return this; - } - - public Builder taskName(String taskName) { - this.taskName = taskName; - return this; - } - - public Builder event(AlertEvent event) { - this.event = event; - return this; - } - - public Builder warningLevel(AlertWarnLevel warnLevel) { - this.warnLevel = warnLevel; - return this; - } - - public Builder taskType(String taskType) { - this.taskType = taskType; - return this; - } - - public Builder retryTimes(Integer retryTimes) { - this.retryTimes = retryTimes; - return this; - } - - public Builder taskState(ExecutionStatus taskState) { - this.taskState = taskState; - return this; - } - - public Builder taskStartTime(Date taskStartTime) { - this.taskStartTime = taskStartTime; - return this; - } - - public Builder taskEndTime(Date taskEndTime) { - this.taskEndTime = taskEndTime; - return this; - } - - public Builder taskHost(String taskHost) { - this.taskHost = taskHost; - return this; - } - - public Builder logPath(String logPath) { - this.logPath = logPath; - return this; - } - - public ProcessAlertContent build() { - return new ProcessAlertContent(this); - } - } } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java index 054df92e4f..c9608416d1 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java @@ -17,17 +17,19 @@ package org.apache.dolphinscheduler.dao.entity; +import lombok.Data; +import lombok.NoArgsConstructor; + import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.FailureStrategy; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.Priority; import org.apache.dolphinscheduler.common.enums.TaskDependType; import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.DateUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Date; -import java.util.Objects; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -38,6 +40,8 @@ import com.google.common.base.Strings; /** * process instance */ +@NoArgsConstructor +@Data @TableName("t_ds_process_instance") public class ProcessInstance { @@ -60,7 +64,7 @@ public class ProcessInstance { /** * process state */ - private ExecutionStatus state; + private WorkflowExecutionStatus state; /** * recovery flag for failover */ @@ -254,10 +258,6 @@ public class ProcessInstance { @TableField(exist = false) private boolean isBlocked; - public ProcessInstance() { - - } - /** * set the process name with process define version and timestamp * @@ -272,266 +272,6 @@ public class ProcessInstance { DateUtils.getCurrentTimeStamp()); } - public String getVarPool() { - return varPool; - } - - public void setVarPool(String varPool) { - this.varPool = varPool; - } - - public ProcessDefinition getProcessDefinition() { - return processDefinition; - } - - public void setProcessDefinition(ProcessDefinition processDefinition) { - this.processDefinition = processDefinition; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public ExecutionStatus getState() { - return state; - } - - public void setState(ExecutionStatus state) { - this.state = state; - } - - public Flag getRecovery() { - return recovery; - } - - public void setRecovery(Flag recovery) { - this.recovery = recovery; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public int getRunTimes() { - return runTimes; - } - - public void setRunTimes(int runTimes) { - this.runTimes = runTimes; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public CommandType getCommandType() { - return commandType; - } - - public void setCommandType(CommandType commandType) { - this.commandType = commandType; - } - - public String getCommandParam() { - return commandParam; - } - - public void setCommandParam(String commandParam) { - this.commandParam = commandParam; - } - - public TaskDependType getTaskDependType() { - return taskDependType; - } - - public void setTaskDependType(TaskDependType taskDependType) { - this.taskDependType = taskDependType; - } - - public int getMaxTryTimes() { - return maxTryTimes; - } - - public void setMaxTryTimes(int maxTryTimes) { - this.maxTryTimes = maxTryTimes; - } - - public FailureStrategy getFailureStrategy() { - return failureStrategy; - } - - public void setFailureStrategy(FailureStrategy failureStrategy) { - this.failureStrategy = failureStrategy; - } - - public boolean isProcessInstanceStop() { - return this.state.typeIsFinished(); - } - - public WarningType getWarningType() { - return warningType; - } - - public void setWarningType(WarningType warningType) { - this.warningType = warningType; - } - - public Integer getWarningGroupId() { - return warningGroupId; - } - - public void setWarningGroupId(Integer warningGroupId) { - this.warningGroupId = warningGroupId; - } - - public Date getScheduleTime() { - return scheduleTime; - } - - public void setScheduleTime(Date scheduleTime) { - this.scheduleTime = scheduleTime; - } - - public Date getCommandStartTime() { - return commandStartTime; - } - - public void setCommandStartTime(Date commandStartTime) { - this.commandStartTime = commandStartTime; - } - - public String getGlobalParams() { - return globalParams; - } - - public void setGlobalParams(String globalParams) { - this.globalParams = globalParams; - } - - public DagData getDagData() { - return dagData; - } - - public void setDagData(DagData dagData) { - this.dagData = dagData; - } - - public String getTenantCode() { - return tenantCode; - } - - public void setTenantCode(String tenantCode) { - this.tenantCode = tenantCode; - } - - public String getQueue() { - return queue; - } - - public void setQueue(String queue) { - this.queue = queue; - } - - public int getExecutorId() { - return executorId; - } - - public void setExecutorId(int executorId) { - this.executorId = executorId; - } - - public Flag getIsSubProcess() { - return isSubProcess; - } - - public void setIsSubProcess(Flag isSubProcess) { - this.isSubProcess = isSubProcess; - } - - public Priority getProcessInstancePriority() { - return processInstancePriority; - } - - public void setProcessInstancePriority(Priority processInstancePriority) { - this.processInstancePriority = processInstancePriority; - } - - public String getLocations() { - return locations; - } - - public void setLocations(String locations) { - this.locations = locations; - } - - public String getHistoryCmd() { - return historyCmd; - } - - public void setHistoryCmd(String historyCmd) { - this.historyCmd = historyCmd; - } - - public String getExecutorName() { - return executorName; - } - - public void setExecutorName(String executorName) { - this.executorName = executorName; - } - - public Long getEnvironmentCode() { - return this.environmentCode; - } - - public void setEnvironmentCode(Long environmentCode) { - this.environmentCode = environmentCode; - } - - public int getDryRun() { - return dryRun; - } - - public void setDryRun(int dryRun) { - this.dryRun = dryRun; - } - - public Date getRestartTime() { - return restartTime; - } - - public void setRestartTime(Date restartTime) { - this.restartTime = restartTime; - } - /** * add command to history * @@ -570,177 +310,4 @@ public class ProcessInstance { return commandType; } - public String getDependenceScheduleTimes() { - return dependenceScheduleTimes; - } - - public void setDependenceScheduleTimes(String dependenceScheduleTimes) { - this.dependenceScheduleTimes = dependenceScheduleTimes; - } - - public String getDuration() { - return duration; - } - - public void setDuration(String duration) { - this.duration = duration; - } - - public String getWorkerGroup() { - return workerGroup; - } - - public void setWorkerGroup(String workerGroup) { - this.workerGroup = workerGroup; - } - - public int getTimeout() { - return timeout; - } - - public void setTimeout(int timeout) { - this.timeout = timeout; - } - - public int getTenantId() { - return this.tenantId; - } - - public void setTenantId(int tenantId) { - this.tenantId = tenantId; - } - - public Long getProcessDefinitionCode() { - return processDefinitionCode; - } - - public void setProcessDefinitionCode(Long processDefinitionCode) { - this.processDefinitionCode = processDefinitionCode; - } - - public int getProcessDefinitionVersion() { - return processDefinitionVersion; - } - - public void setProcessDefinitionVersion(int processDefinitionVersion) { - this.processDefinitionVersion = processDefinitionVersion; - } - - public boolean isBlocked() { - return isBlocked; - } - - public void setBlocked(boolean blocked) { - isBlocked = blocked; - } - - @Override - public String toString() { - return "ProcessInstance{" - + "id=" + id - + ", state=" + state - + ", recovery=" + recovery - + ", startTime=" + startTime - + ", endTime=" + endTime - + ", runTimes=" + runTimes - + ", name='" + name + '\'' - + ", host='" + host + '\'' - + ", processDefinition=" - + processDefinition - + ", commandType=" - + commandType - + ", commandParam='" - + commandParam - + '\'' - + ", taskDependType=" - + taskDependType - + ", maxTryTimes=" - + maxTryTimes - + ", failureStrategy=" - + failureStrategy - + ", warningType=" - + warningType - + ", warningGroupId=" - + warningGroupId - + ", scheduleTime=" - + scheduleTime - + ", commandStartTime=" - + commandStartTime - + ", globalParams='" - + globalParams - + '\'' - + ", executorId=" - + executorId - + ", tenantCode='" - + tenantCode - + '\'' - + ", queue='" - + queue - + '\'' - + ", isSubProcess=" - + isSubProcess - + ", locations='" - + locations - + '\'' - + ", historyCmd='" - + historyCmd - + '\'' - + ", dependenceScheduleTimes='" - + dependenceScheduleTimes - + '\'' - + ", duration=" - + duration - + ", processInstancePriority=" - + processInstancePriority - + ", workerGroup='" - + workerGroup - + '\'' - + ", timeout=" - + timeout - + ", tenantId=" - + tenantId - + ", processDefinitionCode='" - + processDefinitionCode - + '\'' - + ", processDefinitionVersion='" - + processDefinitionVersion - + '\'' - + ", dryRun='" - + dryRun - + '\'' - + '}' - + ", restartTime='" - + restartTime - + '\'' - + ", isBlocked=" - + isBlocked - + '}'; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - ProcessInstance that = (ProcessInstance) o; - - return id == that.id; - } - - @Override - public int hashCode() { - return Objects.hash(id); - } - - public int getNextProcessInstanceId() { - return nextProcessInstanceId; - } - - public void setNextProcessInstanceId(int nextProcessInstanceId) { - this.nextProcessInstanceId = nextProcessInstanceId; - } } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java index f8e361e9ed..fbd2f64a59 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskAlertContent.java @@ -17,7 +17,10 @@ package org.apache.dolphinscheduler.dao.entity; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; @@ -25,9 +28,15 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor @JsonInclude(Include.NON_NULL) public class TaskAlertContent implements Serializable { + @JsonProperty("taskInstanceId") private int taskInstanceId; @JsonProperty("taskName") @@ -43,7 +52,7 @@ public class TaskAlertContent implements Serializable { @JsonProperty("processInstanceName") private String processInstanceName; @JsonProperty("state") - private ExecutionStatus state; + private TaskExecutionStatus state; @JsonProperty("startTime") private Date startTime; @JsonProperty("endTime") @@ -53,101 +62,4 @@ public class TaskAlertContent implements Serializable { @JsonProperty("logPath") private String logPath; - private TaskAlertContent(Builder builder) { - this.taskInstanceId = builder.taskInstanceId; - this.taskName = builder.taskName; - this.taskType = builder.taskType; - this.processDefinitionId = builder.processDefinitionId; - this.processDefinitionName = builder.processDefinitionName; - this.processInstanceId = builder.processInstanceId; - this.processInstanceName = builder.processInstanceName; - this.state = builder.state; - this.startTime = builder.startTime; - this.endTime = builder.endTime; - this.host = builder.host; - this.logPath = builder.logPath; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public static class Builder { - private int taskInstanceId; - private String taskName; - private String taskType; - private int processDefinitionId; - private String processDefinitionName; - private int processInstanceId; - private String processInstanceName; - private ExecutionStatus state; - private Date startTime; - private Date endTime; - private String host; - private String logPath; - - public Builder taskInstanceId(int taskInstanceId) { - this.taskInstanceId = taskInstanceId; - return this; - } - - public Builder taskName(String taskName) { - this.taskName = taskName; - return this; - } - - public Builder taskType(String taskType) { - this.taskType = taskType; - return this; - } - - public Builder processDefinitionId(int processDefinitionId) { - this.processDefinitionId = processDefinitionId; - return this; - } - - public Builder processDefinitionName(String processDefinitionName) { - this.processDefinitionName = processDefinitionName; - return this; - } - - public Builder processInstanceId(int processInstanceId) { - this.processInstanceId = processInstanceId; - return this; - } - - public Builder processInstanceName(String processInstanceName) { - this.processInstanceName = processInstanceName; - return this; - } - - public Builder state(ExecutionStatus state) { - this.state = state; - return this; - } - - public Builder startTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Builder endTime(Date endTime) { - this.endTime = endTime; - return this; - } - - public Builder host(String host) { - this.host = host; - return this; - } - - public Builder logPath(String logPath) { - this.logPath = logPath; - return this; - } - - public TaskAlertContent build() { - return new TaskAlertContent(this); - } - } } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java index fc66bfd4cd..b52528b62b 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java @@ -29,7 +29,7 @@ import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.Priority; import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters; @@ -43,9 +43,12 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.core.type.TypeReference; +import lombok.Data; + /** * task instance */ +@Data @TableName("t_ds_task_instance") public class TaskInstance implements Serializable { @@ -60,7 +63,6 @@ public class TaskInstance implements Serializable { */ private String name; - /** * task type */ @@ -96,7 +98,7 @@ public class TaskInstance implements Serializable { /** * state */ - private ExecutionStatus state; + private TaskExecutionStatus state; /** * task first submit time. @@ -223,7 +225,6 @@ public class TaskInstance implements Serializable { @TableField(exist = false) private String dependentResult; - /** * workerGroup */ @@ -255,7 +256,6 @@ public class TaskInstance implements Serializable { @TableField(exist = false) private String executorName; - @TableField(exist = false) private Map resources; @@ -264,7 +264,6 @@ public class TaskInstance implements Serializable { */ private int delayTime; - /** * task params */ @@ -295,199 +294,13 @@ public class TaskInstance implements Serializable { this.executePath = executePath; } - public String getVarPool() { - return varPool; - } - - public void setVarPool(String varPool) { - this.varPool = varPool; - } - - public int getTaskGroupId() { - return taskGroupId; - } - - public void setTaskGroupId(int taskGroupId) { - this.taskGroupId = taskGroupId; - } - - public ProcessInstance getProcessInstance() { - return processInstance; - } - - public void setProcessInstance(ProcessInstance processInstance) { - this.processInstance = processInstance; - } - - public ProcessDefinition getProcessDefine() { - return processDefine; - } - - public void setProcessDefine(ProcessDefinition processDefine) { - this.processDefine = processDefine; - } - - public TaskDefinition getTaskDefine() { - return taskDefine; - } - - public void setTaskDefine(TaskDefinition taskDefine) { - this.taskDefine = taskDefine; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTaskType() { - return taskType; - } - - public void setTaskType(String taskType) { - this.taskType = taskType; - } - - public int getProcessInstanceId() { - return processInstanceId; - } - - public void setProcessInstanceId(int processInstanceId) { - this.processInstanceId = processInstanceId; - } - - public ExecutionStatus getState() { - return state; - } - - public void setState(ExecutionStatus state) { - this.state = state; - } - - public Date getFirstSubmitTime() { - return firstSubmitTime; - } - - public void setFirstSubmitTime(Date firstSubmitTime) { - this.firstSubmitTime = firstSubmitTime; - } - - public Date getSubmitTime() { - return submitTime; - } - - public void setSubmitTime(Date submitTime) { - this.submitTime = submitTime; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public String getExecutePath() { - return executePath; - } - - public void setExecutePath(String executePath) { - this.executePath = executePath; - } - - public String getLogPath() { - return logPath; - } - - public void setLogPath(String logPath) { - this.logPath = logPath; - } - - public Flag getAlertFlag() { - return alertFlag; - } - - public void setAlertFlag(Flag alertFlag) { - this.alertFlag = alertFlag; - } - - public int getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(int retryTimes) { - this.retryTimes = retryTimes; - } - - public Boolean isTaskSuccess() { - return this.state == ExecutionStatus.SUCCESS; - } - - public int getPid() { - return pid; - } - - public void setPid(int pid) { - this.pid = pid; - } - - public String getAppLink() { - return appLink; - } - - public void setAppLink(String appLink) { - this.appLink = appLink; - } - - public Long getEnvironmentCode() { - return this.environmentCode; - } - - public void setEnvironmentCode(Long environmentCode) { - this.environmentCode = environmentCode; - } - - public String getEnvironmentConfig() { - return this.environmentConfig; - } - - public void setEnvironmentConfig(String environmentConfig) { - this.environmentConfig = environmentConfig; - } - public DependentParameters getDependency() { if (this.dependency == null) { - Map taskParamsMap = JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { - }); - this.dependency = JSONUtils.parseObject((String) taskParamsMap.get(Constants.DEPENDENCE), DependentParameters.class); + Map taskParamsMap = + JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { + }); + this.dependency = + JSONUtils.parseObject((String) taskParamsMap.get(Constants.DEPENDENCE), DependentParameters.class); } return this.dependency; } @@ -498,98 +311,28 @@ public class TaskInstance implements Serializable { public SwitchParameters getSwitchDependency() { if (this.switchDependency == null) { - Map taskParamsMap = JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { - }); - this.switchDependency = JSONUtils.parseObject((String) taskParamsMap.get(Constants.SWITCH_RESULT), SwitchParameters.class); + Map taskParamsMap = + JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { + }); + this.switchDependency = + JSONUtils.parseObject((String) taskParamsMap.get(Constants.SWITCH_RESULT), SwitchParameters.class); } return this.switchDependency; } public void setSwitchDependency(SwitchParameters switchDependency) { - Map taskParamsMap = JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { - }); + Map taskParamsMap = + JSONUtils.parseObject(this.getTaskParams(), new TypeReference>() { + }); taskParamsMap.put(Constants.SWITCH_RESULT, JSONUtils.toJsonString(switchDependency)); this.setTaskParams(JSONUtils.toJsonString(taskParamsMap)); } - public Flag getFlag() { - return flag; - } - - public void setFlag(Flag flag) { - this.flag = flag; - } - - public String getProcessInstanceName() { - return processInstanceName; - } - - public void setProcessInstanceName(String processInstanceName) { - this.processInstanceName = processInstanceName; - } - - public String getDuration() { - return duration; - } - - public void setDuration(String duration) { - this.duration = duration; - } - - public int getMaxRetryTimes() { - return maxRetryTimes; - } - - public void setMaxRetryTimes(int maxRetryTimes) { - this.maxRetryTimes = maxRetryTimes; - } - - public int getRetryInterval() { - return retryInterval; - } - - public void setRetryInterval(int retryInterval) { - this.retryInterval = retryInterval; - } - - public int getExecutorId() { - return executorId; - } - - public void setExecutorId(int executorId) { - this.executorId = executorId; - } - - public String getExecutorName() { - return executorName; - } - - public void setExecutorName(String executorName) { - this.executorName = executorName; - } - - public int getDryRun() { - return dryRun; - } - - public void setDryRun(int dryRun) { - this.dryRun = dryRun; - } - public boolean isTaskComplete() { - return this.getState().typeIsPause() - || this.getState().typeIsSuccess() - || this.getState().typeIsCancel() - || (this.getState().typeIsFailure() && !taskCanRetry()); - } - - public Map getResources() { - return resources; - } - - public void setResources(Map resources) { - this.resources = resources; + return this.getState().isSuccess() + || this.getState().isKill() + || (this.getState().isFailure() && !taskCanRetry()); } public boolean isSubProcess() { @@ -622,10 +365,10 @@ public class TaskInstance implements Serializable { if (this.isSubProcess()) { return false; } - if (this.getState() == ExecutionStatus.NEED_FAULT_TOLERANCE) { + if (this.getState() == TaskExecutionStatus.NEED_FAULT_TOLERANCE) { return true; } - return this.getState() == ExecutionStatus.FAILURE && (this.getRetryTimes() < this.getMaxRetryTimes()); + return this.getState() == TaskExecutionStatus.FAILURE && (this.getRetryTimes() < this.getMaxRetryTimes()); } /** @@ -634,7 +377,7 @@ public class TaskInstance implements Serializable { * @return Boolean */ public boolean retryTaskIntervalOverTime() { - if (getState() != ExecutionStatus.FAILURE) { + if (getState() != TaskExecutionStatus.FAILURE) { return true; } if (getMaxRetryTimes() == 0 || getRetryInterval() == 0) { @@ -646,137 +389,8 @@ public class TaskInstance implements Serializable { return getRetryInterval() * SEC_2_MINUTES_TIME_UNIT < failedTimeInterval; } - public Priority getTaskInstancePriority() { - return taskInstancePriority; - } - - public void setTaskInstancePriority(Priority taskInstancePriority) { - this.taskInstancePriority = taskInstancePriority; - } - - public Priority getProcessInstancePriority() { - return processInstancePriority; - } - - public void setProcessInstancePriority(Priority processInstancePriority) { - this.processInstancePriority = processInstancePriority; - } - - public String getWorkerGroup() { - return workerGroup; - } - - public void setWorkerGroup(String workerGroup) { - this.workerGroup = workerGroup; - } - - public String getDependentResult() { - return dependentResult; - } - - public void setDependentResult(String dependentResult) { - this.dependentResult = dependentResult; - } - - public int getDelayTime() { - return delayTime; - } - - public void setDelayTime(int delayTime) { - this.delayTime = delayTime; - } - - @Override - public String toString() { - return "TaskInstance{" - + "id=" + id - + ", name='" + name + '\'' - + ", taskType='" + taskType + '\'' - + ", processInstanceId=" + processInstanceId - + ", processInstanceName='" + processInstanceName + '\'' - + ", state=" + state - + ", firstSubmitTime=" + firstSubmitTime - + ", submitTime=" + submitTime - + ", startTime=" + startTime - + ", endTime=" + endTime - + ", host='" + host + '\'' - + ", executePath='" + executePath + '\'' - + ", logPath='" + logPath + '\'' - + ", retryTimes=" + retryTimes - + ", alertFlag=" + alertFlag - + ", processInstance=" + processInstance - + ", processDefine=" + processDefine - + ", pid=" + pid - + ", appLink='" + appLink + '\'' - + ", flag=" + flag - + ", dependency='" + dependency + '\'' - + ", duration=" + duration - + ", maxRetryTimes=" + maxRetryTimes - + ", retryInterval=" + retryInterval - + ", taskInstancePriority=" + taskInstancePriority - + ", processInstancePriority=" + processInstancePriority - + ", dependentResult='" + dependentResult + '\'' - + ", workerGroup='" + workerGroup + '\'' - + ", environmentCode=" + environmentCode - + ", environmentConfig='" + environmentConfig + '\'' - + ", executorId=" + executorId - + ", executorName='" + executorName + '\'' - + ", delayTime=" + delayTime - + ", dryRun=" + dryRun - + ", taskGroupId=" + taskGroupId - + ", taskGroupPriority=" + taskGroupPriority - + '}'; - } - - public long getTaskCode() { - return taskCode; - } - - public void setTaskCode(long taskCode) { - this.taskCode = taskCode; - } - - public int getTaskDefinitionVersion() { - return taskDefinitionVersion; - } - - public void setTaskDefinitionVersion(int taskDefinitionVersion) { - this.taskDefinitionVersion = taskDefinitionVersion; - } - - public String getTaskParams() { - return taskParams; - } - - public void setTaskParams(String taskParams) { - this.taskParams = taskParams; - } - public boolean isFirstRun() { return endTime == null; } - public int getTaskGroupPriority() { - return taskGroupPriority; - } - - public void setTaskGroupPriority(int taskGroupPriority) { - this.taskGroupPriority = taskGroupPriority; - } - - public Integer getCpuQuota() { - return cpuQuota == null ? -1 : cpuQuota; - } - - public void setCpuQuota(Integer cpuQuota) { - this.cpuQuota = cpuQuota; - } - - public Integer getMemoryMax() { - return memoryMax == null ? -1 : memoryMax; - } - - public void setMemoryMax(Integer memoryMax) { - this.memoryMax = memoryMax; - } } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java index 8c0abf3dce..32226e8b59 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java @@ -17,9 +17,9 @@ package org.apache.dolphinscheduler.dao.mapper; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.ibatis.annotations.Param; @@ -133,8 +133,8 @@ public interface ProcessInstanceMapper extends BaseMapper { * @param destState destState * @return update result */ - int updateProcessInstanceByState(@Param("originState") ExecutionStatus originState, - @Param("destState") ExecutionStatus destState); + int updateProcessInstanceByState(@Param("originState") WorkflowExecutionStatus originState, + @Param("destState") WorkflowExecutionStatus destState); /** * update process instance by tenantId @@ -167,9 +167,9 @@ public interface ProcessInstanceMapper extends BaseMapper { * @return ExecuteStatusCount list */ List countInstanceStateByProjectCodes( - @Param("startTime") Date startTime, - @Param("endTime") Date endTime, - @Param("projectCodes") Long[] projectCodes); + @Param("startTime") Date startTime, + @Param("endTime") Date endTime, + @Param("projectCodes") Long[] projectCodes); /** * query process instance by processDefinitionCode @@ -233,7 +233,7 @@ public interface ProcessInstanceMapper extends BaseMapper { List queryTopNProcessInstance(@Param("size") int size, @Param("startTime") Date startTime, @Param("endTime") Date endTime, - @Param("status") ExecutionStatus status, + @Param("status") WorkflowExecutionStatus status, @Param("projectCode") long projectCode); /** @@ -248,13 +248,16 @@ public interface ProcessInstanceMapper extends BaseMapper { @Param("states") int[] states); List queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(@Param("processDefinitionCode") Long processDefinitionCode, - @Param("processDefinitionVersion") int processDefinitionVersion, - @Param("states") int[] states, @Param("id") int id); + @Param("processDefinitionVersion") int processDefinitionVersion, + @Param("states") int[] states, + @Param("id") int id); int updateGlobalParamsById(@Param("globalParams") String globalParams, @Param("id") int id); - boolean updateNextProcessIdById(@Param("thisInstanceId") int thisInstanceId, @Param("runningInstanceId") int runningInstanceId); + boolean updateNextProcessIdById(@Param("thisInstanceId") int thisInstanceId, + @Param("runningInstanceId") int runningInstanceId); - ProcessInstance loadNextProcess4Serial(@Param("processDefinitionCode") Long processDefinitionCode, @Param("state") int state, @Param("id") int id); + ProcessInstance loadNextProcess4Serial(@Param("processDefinitionCode") Long processDefinitionCode, + @Param("state") int state, @Param("id") int id); } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java index f98996952d..17acff69d9 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java @@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -44,7 +44,7 @@ public interface TaskInstanceMapper extends BaseMapper { int setFailoverByHostAndStateArray(@Param("host") String host, @Param("states") int[] stateArray, - @Param("destStatus") ExecutionStatus destStatus); + @Param("destStatus") TaskExecutionStatus destStatus); TaskInstance queryByInstanceIdAndName(@Param("processInstanceId") int processInstanceId, @Param("name") String name); @@ -82,7 +82,7 @@ public interface TaskInstanceMapper extends BaseMapper { List countTaskInstanceStateByProjectCodesAndStatesBySubmitTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("projectCodes") Long[] projectCodes, - @Param("states") List states); + @Param("states") List states); IPage queryTaskInstanceListPaging(IPage page, @Param("projectCode") Long projectCode, @@ -94,8 +94,8 @@ public interface TaskInstanceMapper extends BaseMapper { @Param("states") int[] statusArray, @Param("host") String host, @Param("startTime") Date startTime, - @Param("endTime") Date endTime - ); + @Param("endTime") Date endTime); - List loadAllInfosNoRelease(@Param("processInstanceId") int processInstanceId, @Param("status") int status); + List loadAllInfosNoRelease(@Param("processInstanceId") int processInstanceId, + @Param("status") int status); } diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java index 9aa69c333f..e2ddca73d9 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java @@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory; */ public class DagHelper { - private static final Logger logger = LoggerFactory.getLogger(DagHelper.class); /** @@ -85,8 +84,10 @@ public class DagHelper { * @param taskDependType taskDependType * @return task node list */ - public static List generateFlowNodeListByStartNode(List taskNodeList, List startNodeNameList, - List recoveryNodeCodeList, TaskDependType taskDependType) { + public static List generateFlowNodeListByStartNode(List taskNodeList, + List startNodeNameList, + List recoveryNodeCodeList, + TaskDependType taskDependType) { List destFlowNodeList = new ArrayList<>(); List startNodeList = startNodeNameList; @@ -112,16 +113,16 @@ public class DagHelper { List childNodeList = new ArrayList<>(); if (startNode == null) { logger.error("start node name [{}] is not in task node list [{}] ", - startNodeCode, - taskNodeList - ); + startNodeCode, + taskNodeList); continue; } else if (TaskDependType.TASK_POST == taskDependType) { List visitedNodeCodeList = new ArrayList<>(); childNodeList = getFlowNodeListPost(startNode, taskNodeList, visitedNodeCodeList); } else if (TaskDependType.TASK_PRE == taskDependType) { List visitedNodeCodeList = new ArrayList<>(); - childNodeList = getFlowNodeListPre(startNode, recoveryNodeCodeList, taskNodeList, visitedNodeCodeList); + childNodeList = + getFlowNodeListPre(startNode, recoveryNodeCodeList, taskNodeList, visitedNodeCodeList); } else { childNodeList.add(startNode); } @@ -144,11 +145,13 @@ public class DagHelper { * @param taskNodeList taskNodeList * @return task node list */ - private static List getFlowNodeListPost(TaskNode startNode, List taskNodeList, List visitedNodeCodeList) { + private static List getFlowNodeListPost(TaskNode startNode, List taskNodeList, + List visitedNodeCodeList) { List resultList = new ArrayList<>(); for (TaskNode taskNode : taskNodeList) { List depList = taskNode.getDepList(); - if (null != depList && null != startNode && depList.contains(Long.toString(startNode.getCode())) && !visitedNodeCodeList.contains(Long.toString(taskNode.getCode()))) { + if (null != depList && null != startNode && depList.contains(Long.toString(startNode.getCode())) + && !visitedNodeCodeList.contains(Long.toString(taskNode.getCode()))) { resultList.addAll(getFlowNodeListPost(taskNode, taskNodeList, visitedNodeCodeList)); } } @@ -169,7 +172,8 @@ public class DagHelper { * @param taskNodeList taskNodeList * @return task node list */ - private static List getFlowNodeListPre(TaskNode startNode, List recoveryNodeCodeList, List taskNodeList, List visitedNodeCodeList) { + private static List getFlowNodeListPre(TaskNode startNode, List recoveryNodeCodeList, + List taskNodeList, List visitedNodeCodeList) { List resultList = new ArrayList<>(); @@ -211,7 +215,8 @@ public class DagHelper { List recoveryNodeCodeList, TaskDependType depNodeType) throws Exception { - List destTaskNodeList = generateFlowNodeListByStartNode(totalTaskNodeList, startNodeNameList, recoveryNodeCodeList, depNodeType); + List destTaskNodeList = generateFlowNodeListByStartNode(totalTaskNodeList, startNodeNameList, + recoveryNodeCodeList, depNodeType); if (destTaskNodeList.isEmpty()) { return null; } @@ -334,8 +339,7 @@ public class DagHelper { * if all of the task dependence are skipped, skip it too. */ private static boolean isTaskNodeNeedSkip(TaskNode taskNode, - Map skipTaskNodeList - ) { + Map skipTaskNodeList) { if (CollectionUtils.isEmpty(taskNode.getDepList())) { return false; } @@ -367,10 +371,10 @@ public class DagHelper { ConditionsParameters conditionsParameters = JSONUtils.parseObject(taskNode.getConditionResult(), ConditionsParameters.class); List skipNodeList = new ArrayList<>(); - if (taskInstance.getState().typeIsSuccess()) { + if (taskInstance.getState().isSuccess()) { conditionTaskList = conditionsParameters.getSuccessNode(); skipNodeList = conditionsParameters.getFailedNode(); - } else if (taskInstance.getState().typeIsFailure()) { + } else if (taskInstance.getState().isFailure()) { conditionTaskList = conditionsParameters.getFailedNode(); skipNodeList = conditionsParameters.getSuccessNode(); } else { @@ -413,7 +417,8 @@ public class DagHelper { Map completeTaskList, DAG dag) { - SwitchParameters switchParameters = completeTaskList.get(Long.toString(taskNode.getCode())).getSwitchDependency(); + SwitchParameters switchParameters = + completeTaskList.get(Long.toString(taskNode.getCode())).getSwitchDependency(); int resultConditionLocation = switchParameters.getResultConditionLocation(); List conditionResultVoList = switchParameters.getDependTaskList(); List switchTaskList = conditionResultVoList.get(resultConditionLocation).getNextNode(); @@ -459,14 +464,14 @@ public class DagHelper { DAG dag = new DAG<>(); - //add vertex + // add vertex if (CollectionUtils.isNotEmpty(processDag.getNodes())) { for (TaskNode node : processDag.getNodes()) { dag.addNode(Long.toString(node.getCode()), node); } } - //add edge + // add edge if (CollectionUtils.isNotEmpty(processDag.getEdges())) { for (TaskNodeRelation edge : processDag.getEdges()) { dag.addEdge(edge.getStartNode(), edge.getEndNode()); @@ -526,7 +531,8 @@ public class DagHelper { && taskNodeMap.containsKey(preTaskCode) && taskNodeMap.containsKey(postTaskCode)) { TaskNode preNode = taskNodeMap.get(preTaskCode); TaskNode postNode = taskNodeMap.get(postTaskCode); - taskNodeRelations.add(new TaskNodeRelation(Long.toString(preNode.getCode()), Long.toString(postNode.getCode()))); + taskNodeRelations + .add(new TaskNodeRelation(Long.toString(preNode.getCode()), Long.toString(postNode.getCode()))); } } ProcessDag processDag = new ProcessDag(); @@ -539,8 +545,7 @@ public class DagHelper { * is there have conditions after the parent node */ public static boolean haveConditionsAfterNode(String parentNodeCode, - DAG dag - ) { + DAG dag) { return haveSubAfterNode(parentNodeCode, dag, TaskConstants.TASK_TYPE_CONDITIONS); } @@ -560,12 +565,11 @@ public class DagHelper { return false; } - /** * is there have blocking node after the parent node */ public static boolean haveBlockingAfterNode(String parentNodeCode, - DAG dag) { + DAG dag) { return haveSubAfterNode(parentNodeCode, dag, TaskConstants.TASK_TYPE_BLOCKING); } @@ -573,7 +577,7 @@ public class DagHelper { * is there have all node after the parent node */ public static boolean haveAllNodeAfterNode(String parentNodeCode, - DAG dag) { + DAG dag) { return haveSubAfterNode(parentNodeCode, dag, null); } @@ -581,17 +585,17 @@ public class DagHelper { * Whether there is a specified type of child node after the parent node */ public static boolean haveSubAfterNode(String parentNodeCode, - DAG dag, String filterNodeType) { + DAG dag, String filterNodeType) { Set subsequentNodes = dag.getSubsequentNodes(parentNodeCode); if (CollectionUtils.isEmpty(subsequentNodes)) { return false; } - if (StringUtils.isBlank(filterNodeType)){ + if (StringUtils.isBlank(filterNodeType)) { return true; } for (String nodeName : subsequentNodes) { TaskNode taskNode = dag.getNode(nodeName); - if (taskNode.getType().equalsIgnoreCase(filterNodeType)){ + if (taskNode.getType().equalsIgnoreCase(filterNodeType)) { return true; } } diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java index c5f2d28ce1..6fccfa234b 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java @@ -19,16 +19,17 @@ package org.apache.dolphinscheduler.dao.mapper; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.dao.BaseDaoTest; import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.Project; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Date; import java.util.List; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +58,7 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { processInstance.setProcessDefinitionCode(1L); processInstance.setStartTime(start); processInstance.setEndTime(end); - processInstance.setState(ExecutionStatus.SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUCCESS); processInstanceMapper.insert(processInstance); return processInstance; @@ -69,14 +70,14 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { * @return ProcessInstance */ private ProcessInstance insertOne() { - //insertOne + // insertOne ProcessInstance processInstance = new ProcessInstance(); Date start = new Date(2019 - 1900, 1 - 1, 1, 0, 10, 0); Date end = new Date(2019 - 1900, 1 - 1, 1, 1, 0, 0); processInstance.setProcessDefinitionCode(1L); processInstance.setStartTime(start); processInstance.setEndTime(end); - processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUBMITTED_SUCCESS); processInstanceMapper.insert(processInstance); return processInstance; @@ -87,9 +88,9 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { */ @Test public void testUpdate() { - //insertOne + // insertOne ProcessInstance processInstanceMap = insertOne(); - //update + // update int update = processInstanceMapper.updateById(processInstanceMap); Assert.assertEquals(1, update); processInstanceMapper.deleteById(processInstanceMap.getId()); @@ -111,7 +112,7 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { @Test public void testQuery() { ProcessInstance processInstance = insertOne(); - //query + // query List dataSources = processInstanceMapper.selectList(null); Assert.assertNotEquals(dataSources.size(), 0); processInstanceMapper.deleteById(processInstance.getId()); @@ -137,12 +138,12 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { public void testQueryByHostAndStates() { ProcessInstance processInstance = insertOne(); processInstance.setHost("192.168.2.155"); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstanceMapper.updateById(processInstance); int[] stateArray = new int[]{ - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.SUCCESS.ordinal()}; + TaskExecutionStatus.RUNNING_EXECUTION.getCode(), + TaskExecutionStatus.SUCCESS.getCode()}; List processInstances = processInstanceMapper.queryByHostAndStatus(null, stateArray); @@ -157,8 +158,8 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { public void testQueryProcessInstanceListPaging() { int[] stateArray = new int[]{ - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.SUCCESS.ordinal()}; + WorkflowExecutionStatus.RUNNING_EXECUTION.getCode(), + WorkflowExecutionStatus.SUCCESS.getCode()}; ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.setCode(1L); @@ -170,7 +171,7 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { ProcessInstance processInstance = insertOne(); processInstance.setProcessDefinitionCode(processDefinition.getCode()); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setIsSubProcess(Flag.NO); processInstance.setStartTime(new Date()); @@ -187,8 +188,7 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { stateArray, processInstance.getHost(), null, - null - ); + null); Assert.assertNotEquals(processInstanceIPage.getTotal(), 0); processDefinitionMapper.deleteById(processDefinition.getId()); @@ -202,12 +202,12 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { public void testSetFailoverByHostAndStateArray() { int[] stateArray = new int[]{ - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.SUCCESS.ordinal()}; + WorkflowExecutionStatus.RUNNING_EXECUTION.ordinal(), + WorkflowExecutionStatus.SUCCESS.ordinal()}; ProcessInstance processInstance = insertOne(); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setHost("192.168.2.220"); processInstanceMapper.updateById(processInstance); String host = processInstance.getHost(); @@ -227,14 +227,15 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { ProcessInstance processInstance = insertOne(); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstanceMapper.updateById(processInstance); - processInstanceMapper.updateProcessInstanceByState(ExecutionStatus.RUNNING_EXECUTION, ExecutionStatus.SUCCESS); + processInstanceMapper.updateProcessInstanceByState(WorkflowExecutionStatus.RUNNING_EXECUTION, + WorkflowExecutionStatus.SUCCESS); ProcessInstance processInstance1 = processInstanceMapper.selectById(processInstance.getId()); processInstanceMapper.deleteById(processInstance.getId()); - Assert.assertEquals(ExecutionStatus.SUCCESS, processInstance1.getState()); + Assert.assertEquals(WorkflowExecutionStatus.SUCCESS, processInstance1.getState()); } @@ -264,7 +265,8 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { Long[] projectCodes = new Long[]{processDefinition.getProjectCode()}; - List executeStatusCounts = processInstanceMapper.countInstanceStateByProjectCodes(null, null, projectCodes); + List executeStatusCounts = + processInstanceMapper.countInstanceStateByProjectCodes(null, null, projectCodes); Assert.assertNotEquals(executeStatusCounts.size(), 0); @@ -281,10 +283,12 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { ProcessInstance processInstance = insertOne(); ProcessInstance processInstance1 = insertOne(); - List processInstances = processInstanceMapper.queryByProcessDefineCode(processInstance.getProcessDefinitionCode(), 1); + List processInstances = + processInstanceMapper.queryByProcessDefineCode(processInstance.getProcessDefinitionCode(), 1); Assert.assertEquals(1, processInstances.size()); - processInstances = processInstanceMapper.queryByProcessDefineCode(processInstance.getProcessDefinitionCode(), 2); + processInstances = + processInstanceMapper.queryByProcessDefineCode(processInstance.getProcessDefinitionCode(), 2); Assert.assertEquals(2, processInstances.size()); processInstanceMapper.deleteById(processInstance.getId()); @@ -300,7 +304,8 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { processInstance.setScheduleTime(new Date()); processInstanceMapper.updateById(processInstance); - ProcessInstance processInstance1 = processInstanceMapper.queryLastSchedulerProcess(processInstance.getProcessDefinitionCode(), null, null); + ProcessInstance processInstance1 = + processInstanceMapper.queryLastSchedulerProcess(processInstance.getProcessDefinitionCode(), null, null); Assert.assertNotEquals(processInstance1, null); processInstanceMapper.deleteById(processInstance.getId()); } @@ -311,14 +316,15 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { @Test public void testQueryLastRunningProcess() { ProcessInstance processInstance = insertOne(); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstanceMapper.updateById(processInstance); int[] stateArray = new int[]{ - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.SUBMITTED_SUCCESS.ordinal()}; + WorkflowExecutionStatus.RUNNING_EXECUTION.ordinal(), + WorkflowExecutionStatus.SUBMITTED_SUCCESS.ordinal()}; - ProcessInstance processInstance1 = processInstanceMapper.queryLastRunningProcess(processInstance.getProcessDefinitionCode(), null, null, stateArray); + ProcessInstance processInstance1 = processInstanceMapper + .queryLastRunningProcess(processInstance.getProcessDefinitionCode(), null, null, stateArray); Assert.assertNotEquals(processInstance1, null); processInstanceMapper.deleteById(processInstance.getId()); @@ -334,13 +340,13 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { Date start = new Date(2019 - 1900, 1 - 1, 01, 0, 0, 0); Date end = new Date(2019 - 1900, 1 - 1, 01, 5, 0, 0); - ProcessInstance processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end - ); + ProcessInstance processInstance1 = + processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end); Assert.assertEquals(processInstance1.getId(), processInstance.getId()); start = new Date(2019 - 1900, 1 - 1, 01, 1, 0, 0); - processInstance1 = processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end - ); + processInstance1 = + processInstanceMapper.queryLastManualProcess(processInstance.getProcessDefinitionCode(), start, end); Assert.assertNull(processInstance1); processInstanceMapper.deleteById(processInstance.getId()); @@ -353,7 +359,8 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { private boolean isSortedByDuration(List processInstances) { for (int i = 1; i < processInstances.size(); i++) { long d1 = processInstances.get(i).getEndTime().getTime() - processInstances.get(i).getStartTime().getTime(); - long d2 = processInstances.get(i - 1).getEndTime().getTime() - processInstances.get(i - 1).getStartTime().getTime(); + long d2 = processInstances.get(i - 1).getEndTime().getTime() + - processInstances.get(i - 1).getStartTime().getTime(); if (d1 > d2) { return false; } @@ -377,11 +384,12 @@ public class ProcessInstanceMapperTest extends BaseDaoTest { ProcessInstance processInstance3 = insertOne(startTime3, endTime3); Date start = new Date(2020, 1, 1, 1, 1, 1); Date end = new Date(2021, 1, 1, 1, 1, 1); - List processInstances = processInstanceMapper.queryTopNProcessInstance(2, start, end, ExecutionStatus.SUCCESS,0L); + List processInstances = + processInstanceMapper.queryTopNProcessInstance(2, start, end, WorkflowExecutionStatus.SUCCESS, 0L); Assert.assertEquals(2, processInstances.size()); Assert.assertTrue(isSortedByDuration(processInstances)); for (ProcessInstance processInstance : processInstances) { - Assert.assertTrue(processInstance.getState().typeIsSuccess()); + Assert.assertTrue(processInstance.getState().isSuccess()); } processInstanceMapper.deleteById(processInstance1.getId()); processInstanceMapper.deleteById(processInstance2.getId()); diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java index 4bcdab8550..fe86cc7c0a 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java @@ -18,16 +18,17 @@ package org.apache.dolphinscheduler.dao.mapper; import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.dao.BaseDaoTest; import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Date; import java.util.List; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -62,7 +63,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { * @return TaskInstance */ private TaskInstance insertTaskInstance(int processInstanceId) { - //insertOne + // insertOne return insertTaskInstance(processInstanceId, "SHELL"); } @@ -75,12 +76,12 @@ public class TaskInstanceMapperTest extends BaseDaoTest { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(1); processInstance.setName("taskName"); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setStartTime(new Date()); processInstance.setEndTime(new Date()); processInstance.setProcessDefinitionCode(1L); processInstanceMapper.insert(processInstance); - return processInstanceMapper.queryByProcessDefineCode(1L,1).get(0); + return processInstanceMapper.queryByProcessDefineCode(1L, 1).get(0); } /** @@ -90,7 +91,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { TaskInstance taskInstance = new TaskInstance(); taskInstance.setFlag(Flag.YES); taskInstance.setName("us task"); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); taskInstance.setEndTime(new Date()); taskInstance.setProcessInstanceId(processInstanceId); @@ -140,7 +141,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { // insert taskInstance TaskInstance taskInstance = insertTaskInstance(processInstance.getId()); - //query + // query List taskInstances = taskInstanceMapper.selectList(null); taskInstanceMapper.deleteById(taskInstance.getId()); Assert.assertNotEquals(taskInstances.size(), 0); @@ -160,8 +161,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { taskInstanceMapper.updateById(task); List taskInstances = taskInstanceMapper.queryTaskByProcessIdAndState( task.getProcessInstanceId(), - ExecutionStatus.RUNNING_EXECUTION.ordinal() - ); + TaskExecutionStatus.RUNNING_EXECUTION.getCode()); taskInstanceMapper.deleteById(task.getId()); Assert.assertNotEquals(taskInstances.size(), 0); } @@ -184,8 +184,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { List taskInstances = taskInstanceMapper.findValidTaskListByProcessId( task.getProcessInstanceId(), - Flag.YES - ); + Flag.YES); task2.setFlag(Flag.NO); taskInstanceMapper.updateById(task2); @@ -212,8 +211,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { taskInstanceMapper.updateById(task); List taskInstances = taskInstanceMapper.queryByHostAndStatus( - task.getHost(), new int[]{ExecutionStatus.RUNNING_EXECUTION.ordinal()} - ); + task.getHost(), new int[]{TaskExecutionStatus.RUNNING_EXECUTION.getCode()}); taskInstanceMapper.deleteById(task.getId()); Assert.assertNotEquals(taskInstances.size(), 0); } @@ -233,9 +231,8 @@ public class TaskInstanceMapperTest extends BaseDaoTest { int setResult = taskInstanceMapper.setFailoverByHostAndStateArray( task.getHost(), - new int[]{ExecutionStatus.RUNNING_EXECUTION.ordinal()}, - ExecutionStatus.NEED_FAULT_TOLERANCE - ); + new int[]{TaskExecutionStatus.RUNNING_EXECUTION.getCode()}, + TaskExecutionStatus.NEED_FAULT_TOLERANCE); taskInstanceMapper.deleteById(task.getId()); Assert.assertNotEquals(setResult, 0); } @@ -255,8 +252,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndName( task.getProcessInstanceId(), - task.getName() - ); + task.getName()); taskInstanceMapper.deleteById(task.getId()); Assert.assertNotEquals(taskInstance, null); } @@ -275,9 +271,8 @@ public class TaskInstanceMapperTest extends BaseDaoTest { taskInstanceMapper.updateById(task); TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndCode( - task.getProcessInstanceId(), - task.getTaskCode() - ); + task.getProcessInstanceId(), + task.getTaskCode()); taskInstanceMapper.deleteById(task.getId()); Assert.assertNotEquals(taskInstance, null); } @@ -302,12 +297,10 @@ public class TaskInstanceMapperTest extends BaseDaoTest { int countTask = taskInstanceMapper.countTask( new Long[0], - new int[0] - ); + new int[0]); int countTask2 = taskInstanceMapper.countTask( new Long[]{definition.getProjectCode()}, - new int[]{task.getId()} - ); + new int[]{task.getId()}); taskInstanceMapper.deleteById(task.getId()); processDefinitionMapper.deleteById(definition.getId()); Assert.assertEquals(countTask, 0); @@ -336,8 +329,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { List count = taskInstanceMapper.countTaskInstanceStateByProjectCodes( null, null, - new Long[]{definition.getProjectCode()} - ); + new Long[]{definition.getProjectCode()}); processDefinitionMapper.deleteById(definition.getId()); taskInstanceMapper.deleteById(task.getId()); @@ -372,8 +364,7 @@ public class TaskInstanceMapperTest extends BaseDaoTest { 0, new int[0], "", - null, null - ); + null, null); processInstanceMapper.deleteById(processInstance.getId()); taskInstanceMapper.deleteById(task.getId()); processDefinitionMapper.deleteById(definition.getId()); diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java index e0dafeb5bf..e03aa63cf3 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java @@ -29,7 +29,7 @@ import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.dao.entity.ProcessData; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo; import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters; @@ -51,7 +51,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; public class DagHelperTest { @Test - public void testHaveSubAfterNode(){ + public void testHaveSubAfterNode() { String parentNodeCode = "5293789969856"; List taskNodeRelations = new ArrayList<>(); TaskNodeRelation relation = new TaskNodeRelation(); @@ -86,7 +86,7 @@ public class DagHelperTest { ProcessDag processDag = new ProcessDag(); processDag.setEdges(taskNodeRelations); processDag.setNodes(taskNodes); - DAG dag = DagHelper.buildDagGraph(processDag); + DAG dag = DagHelper.buildDagGraph(processDag); boolean canSubmit = DagHelper.haveAllNodeAfterNode(parentNodeCode, dag); Assert.assertTrue(canSubmit); @@ -107,8 +107,8 @@ public class DagHelperTest { */ @Test public void testTaskNodeCanSubmit() throws IOException { - //1->2->3->5->7 - //4->3->6 + // 1->2->3->5->7 + // 4->3->6 DAG dag = generateDag(); TaskNode taskNode3 = dag.getNode("3"); Map completeTaskList = new HashMap<>(); @@ -151,14 +151,14 @@ public class DagHelperTest { Map skipNodeList = new HashMap<>(); Set postNodes = null; - //complete : null + // complete : null // expect post: 1/4 postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); Assert.assertEquals(2, postNodes.size()); Assert.assertTrue(postNodes.contains("1")); Assert.assertTrue(postNodes.contains("4")); - //complete : 1 + // complete : 1 // expect post: 2/4 completeTaskList.put("1", new TaskInstance()); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); @@ -218,7 +218,7 @@ public class DagHelperTest { Map skipNodeList = new HashMap<>(); Set postNodes = null; // dag: 1-2-3-5-7 4-3-6 2-8-5-7 - // forbid:2 complete:1 post:4/8 + // forbid:2 complete:1 post:4/8 completeTaskList.put("1", new TaskInstance()); TaskNode node2 = dag.getNode("2"); node2.setRunFlag(Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); @@ -227,7 +227,7 @@ public class DagHelperTest { Assert.assertTrue(postNodes.contains("4")); Assert.assertTrue(postNodes.contains("8")); - //forbid:2/4 complete:1 post:3/8 + // forbid:2/4 complete:1 post:3/8 TaskNode node4 = dag.getNode("4"); node4.setRunFlag(Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); @@ -235,7 +235,7 @@ public class DagHelperTest { Assert.assertTrue(postNodes.contains("3")); Assert.assertTrue(postNodes.contains("8")); - //forbid:2/4/5 complete:1/8 post:3 + // forbid:2/4/5 complete:1/8 post:3 completeTaskList.put("8", new TaskInstance()); TaskNode node5 = dag.getNode("5"); node5.setRunFlag(Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); @@ -275,24 +275,24 @@ public class DagHelperTest { " }"); completeTaskList.remove("3"); TaskInstance taskInstance = new TaskInstance(); - taskInstance.setState(ExecutionStatus.SUCCESS); - //complete 1/2/3/4 expect:8 + taskInstance.setState(TaskExecutionStatus.SUCCESS); + // complete 1/2/3/4 expect:8 completeTaskList.put("3", taskInstance); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); Assert.assertEquals(1, postNodes.size()); Assert.assertTrue(postNodes.contains("8")); - //2.complete 1/2/3/4/8 expect:5 skip:6 + // 2.complete 1/2/3/4/8 expect:5 skip:6 completeTaskList.put("8", new TaskInstance()); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); Assert.assertTrue(postNodes.contains("5")); Assert.assertEquals(1, skipNodeList.size()); Assert.assertTrue(skipNodeList.containsKey("6")); - // 3.complete 1/2/3/4/5/8 expect post:7 skip:6 + // 3.complete 1/2/3/4/5/8 expect post:7 skip:6 skipNodeList.clear(); TaskInstance taskInstance1 = new TaskInstance(); - taskInstance.setState(ExecutionStatus.SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUCCESS); completeTaskList.put("5", taskInstance1); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); Assert.assertEquals(1, postNodes.size()); @@ -310,7 +310,7 @@ public class DagHelperTest { Map taskParamsMap = new HashMap<>(); taskParamsMap.put(Constants.SWITCH_RESULT, ""); taskInstance.setTaskParams(JSONUtils.toJsonString(taskParamsMap)); - taskInstance.setState(ExecutionStatus.FAILURE); + taskInstance.setState(TaskExecutionStatus.FAILURE); completeTaskList.put("3", taskInstance); postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); Assert.assertEquals(1, postNodes.size()); @@ -526,15 +526,16 @@ public class DagHelperTest { @Test public void testBuildDagGraph() { - String shellJson = "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-9527\",\"name\":\"shell-1\"," - + - "\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"#!/bin/bash\\necho \\\"shell-1\\\"\"}," - + - "\"description\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\"," - + - "\"timeout\":{\"strategy\":\"\",\"interval\":1,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\"," - + - "\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}"; + String shellJson = + "{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-9527\",\"name\":\"shell-1\"," + + + "\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"#!/bin/bash\\necho \\\"shell-1\\\"\"}," + + + "\"description\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\"," + + + "\"timeout\":{\"strategy\":\"\",\"interval\":1,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\"," + + + "\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}"; ProcessData processData = JSONUtils.parseObject(shellJson, ProcessData.class); assert processData != null; diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/builder/TaskExecutionContextBuilder.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/builder/TaskExecutionContextBuilder.java index 975b7a64b4..65b3952efd 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/builder/TaskExecutionContextBuilder.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/builder/TaskExecutionContextBuilder.java @@ -27,7 +27,7 @@ import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.DataQualityTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; @@ -43,7 +43,7 @@ public class TaskExecutionContextBuilder { return new TaskExecutionContextBuilder(); } - private TaskExecutionContext taskExecutionContext = new TaskExecutionContext(); + private TaskExecutionContext taskExecutionContext = new TaskExecutionContext(); /** * build taskInstance related info @@ -65,7 +65,7 @@ public class TaskExecutionContextBuilder { taskExecutionContext.setDelayTime(taskInstance.getDelayTime()); taskExecutionContext.setVarPool(taskInstance.getVarPool()); taskExecutionContext.setDryRun(taskInstance.getDryRun()); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.SUBMITTED_SUCCESS); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.SUBMITTED_SUCCESS); taskExecutionContext.setCpuQuota(taskInstance.getCpuQuota()); taskExecutionContext.setMemoryMax(taskInstance.getMemoryMax()); return this; @@ -76,8 +76,9 @@ public class TaskExecutionContextBuilder { if (taskDefinition.getTimeoutFlag() == TimeoutFlag.OPEN) { taskExecutionContext.setTaskTimeoutStrategy(taskDefinition.getTimeoutNotifyStrategy()); if (taskDefinition.getTimeoutNotifyStrategy() == TaskTimeoutStrategy.FAILED - || taskDefinition.getTimeoutNotifyStrategy() == TaskTimeoutStrategy.WARNFAILED) { - taskExecutionContext.setTaskTimeout(Math.min(taskDefinition.getTimeout() * SEC_2_MINUTES_TIME_UNIT, Integer.MAX_VALUE)); + || taskDefinition.getTimeoutNotifyStrategy() == TaskTimeoutStrategy.WARNFAILED) { + taskExecutionContext.setTaskTimeout( + Math.min(taskDefinition.getTimeout() * SEC_2_MINUTES_TIME_UNIT, Integer.MAX_VALUE)); } } taskExecutionContext.setTaskParams(taskDefinition.getTaskParams()); @@ -155,7 +156,6 @@ public class TaskExecutionContextBuilder { return this; } - /** * create * diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/ProcessInstanceExecCacheManager.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/ProcessInstanceExecCacheManager.java index 59e064105a..0eb0f09a73 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/ProcessInstanceExecCacheManager.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/ProcessInstanceExecCacheManager.java @@ -17,12 +17,12 @@ package org.apache.dolphinscheduler.server.master.cache; -import lombok.NonNull; - import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import java.util.Collection; +import lombok.NonNull; + /** * cache of process instance id and WorkflowExecuteThread */ diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java index 9c7d048ff8..a346142a74 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumer.java @@ -258,7 +258,7 @@ public class TaskPriorityQueueConsumer extends BaseDaemonThread { */ public boolean taskInstanceIsFinalState(int taskInstanceId) { TaskInstance taskInstance = processService.findTaskInstanceById(taskInstanceId); - return taskInstance.getState().typeIsFinished(); + return taskInstance.getState().isFinished(); } /** diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEvent.java index 68cd582994..f3a9a6579e 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEvent.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/StateEvent.java @@ -17,35 +17,32 @@ package org.apache.dolphinscheduler.server.master.event; +import lombok.NonNull; import org.apache.dolphinscheduler.common.enums.StateEventType; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import io.netty.channel.Channel; -import lombok.Data; + +import javax.annotation.Nullable; /** * state event */ -@Data -public class StateEvent { +public interface StateEvent { - /** - * origin_pid-origin_task_id-process_instance_id-task_instance_id - */ - private String key; + int getProcessInstanceId(); - private StateEventType type; + int getTaskInstanceId(); - private ExecutionStatus executionStatus; + @NonNull + StateEventType getType(); - private int taskInstanceId; + @Nullable + String getKey(); - private long taskCode; + @Nullable + Channel getChannel(); - private int processInstanceId; - - private String context; - - private Channel channel; + @Nullable + String getContext(); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDelayEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDelayEventHandler.java index ec3382aa3f..51a0830561 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDelayEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDelayEventHandler.java @@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.enums.TaskEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.utils.TaskInstanceUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningAckMessage; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.processor.queue.TaskEvent; @@ -56,7 +55,7 @@ public class TaskDelayEventHandler implements TaskEventHandler { int processInstanceId = taskEvent.getProcessInstanceId(); WorkflowExecuteRunnable workflowExecuteRunnable = - this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteRunnable == null) { sendAckToWorker(taskEvent); throw new TaskEventHandleError("Cannot find related workflow instance from cache"); @@ -67,11 +66,11 @@ public class TaskDelayEventHandler implements TaskEventHandler { return; } TaskInstance taskInstance = taskInstanceOptional.get(); - if (taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState().isFinished()) { logger.warn( - "The current task status is: {}, will not handle the running event, this event is delay, will discard this event: {}", - taskInstance.getState(), - taskEvent); + "The current task status is: {}, will not handle the running event, this event is delay, will discard this event: {}", + taskInstance.getState(), + taskEvent); sendAckToWorker(taskEvent); return; } @@ -97,11 +96,12 @@ public class TaskDelayEventHandler implements TaskEventHandler { } throw new TaskEventHandleError("Handle task dispatch event error, update taskInstance to db failed", ex); } - StateEvent stateEvent = new StateEvent(); - stateEvent.setProcessInstanceId(taskEvent.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskEvent.getTaskInstanceId()); - stateEvent.setExecutionStatus(taskEvent.getState()); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskEvent.getProcessInstanceId()) + .taskInstanceId(taskEvent.getTaskInstanceId()) + .status(taskEvent.getState()) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } @@ -109,7 +109,7 @@ public class TaskDelayEventHandler implements TaskEventHandler { private void sendAckToWorker(TaskEvent taskEvent) { // If event handle success, send ack to worker to otherwise the worker will retry this event TaskExecuteRunningAckMessage taskExecuteRunningAckMessage = - new TaskExecuteRunningAckMessage(ExecutionStatus.SUCCESS, taskEvent.getTaskInstanceId()); + new TaskExecuteRunningAckMessage(true, taskEvent.getTaskInstanceId()); taskEvent.getChannel().writeAndFlush(taskExecuteRunningAckMessage.convert2Command()); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDispatchEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDispatchEventHandler.java index 9378f0c36e..83d11db80d 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDispatchEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskDispatchEventHandler.java @@ -20,7 +20,7 @@ package org.apache.dolphinscheduler.server.master.event; import org.apache.dolphinscheduler.common.enums.TaskEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.utils.TaskInstanceUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.processor.queue.TaskEvent; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; @@ -48,16 +48,16 @@ public class TaskDispatchEventHandler implements TaskEventHandler { int processInstanceId = taskEvent.getProcessInstanceId(); WorkflowExecuteRunnable workflowExecuteRunnable = - this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteRunnable == null) { throw new TaskEventHandleError("Cannot find related workflow instance from cache"); } TaskInstance taskInstance = workflowExecuteRunnable.getTaskInstance(taskInstanceId) - .orElseThrow(() -> new TaskEventHandleError("Cannot find related taskInstance from cache")); - if (taskInstance.getState() != ExecutionStatus.SUBMITTED_SUCCESS) { + .orElseThrow(() -> new TaskEventHandleError("Cannot find related taskInstance from cache")); + if (taskInstance.getState() != TaskExecutionStatus.SUBMITTED_SUCCESS) { logger.warn( - "The current taskInstance status is not SUBMITTED_SUCCESS, so the dispatch event will be discarded, the current is a delay event, event: {}", - taskEvent); + "The current taskInstance status is not SUBMITTED_SUCCESS, so the dispatch event will be discarded, the current is a delay event, event: {}", + taskEvent); return; } @@ -65,7 +65,7 @@ public class TaskDispatchEventHandler implements TaskEventHandler { TaskInstance oldTaskInstance = new TaskInstance(); TaskInstanceUtils.copyTaskInstance(taskInstance, oldTaskInstance); // update the taskInstance status - taskInstance.setState(ExecutionStatus.DISPATCH); + taskInstance.setState(TaskExecutionStatus.DISPATCH); taskInstance.setHost(taskEvent.getWorkerAddress()); try { if (!processService.updateTaskInstance(taskInstance)) { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRejectByWorkerEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRejectByWorkerEventHandler.java index ab63ada0ed..77ac5e52a2 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRejectByWorkerEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRejectByWorkerEventHandler.java @@ -19,7 +19,6 @@ package org.apache.dolphinscheduler.server.master.event; import org.apache.dolphinscheduler.common.enums.TaskEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskRejectAckCommand; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; @@ -44,19 +43,20 @@ public class TaskRejectByWorkerEventHandler implements TaskEventHandler { int processInstanceId = taskEvent.getProcessInstanceId(); WorkflowExecuteRunnable workflowExecuteRunnable = this.processInstanceExecCacheManager.getByProcessInstanceId( - processInstanceId); + processInstanceId); if (workflowExecuteRunnable == null) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task reject event error, cannot find related workflow instance from cache, will discard this event"); + "Handle task reject event error, cannot find related workflow instance from cache, will discard this event"); } TaskInstance taskInstance = workflowExecuteRunnable.getTaskInstance(taskInstanceId).orElseThrow(() -> { sendAckToWorker(taskEvent); return new TaskEventHandleError( - "Handle task reject event error, cannot find the taskInstance from cache, will discord this event"); + "Handle task reject event error, cannot find the taskInstance from cache, will discord this event"); }); try { - // todo: If the worker submit multiple reject response to master, the task instance may be dispatch multiple, + // todo: If the worker submit multiple reject response to master, the task instance may be dispatch + // multiple, // we need to control the worker overload by master rather than worker // if the task resubmit and the worker failover, this task may be dispatch twice? // todo: we need to clear the taskInstance host and rollback the status to submit. @@ -69,11 +69,11 @@ public class TaskRejectByWorkerEventHandler implements TaskEventHandler { } public void sendAckToWorker(TaskEvent taskEvent) { - TaskRejectAckCommand taskRejectAckMessage = new TaskRejectAckCommand(ExecutionStatus.SUCCESS, - taskEvent.getTaskInstanceId(), - masterConfig.getMasterAddress(), - taskEvent.getWorkerAddress(), - System.currentTimeMillis()); + TaskRejectAckCommand taskRejectAckMessage = new TaskRejectAckCommand(true, + taskEvent.getTaskInstanceId(), + masterConfig.getMasterAddress(), + taskEvent.getWorkerAddress(), + System.currentTimeMillis()); taskEvent.getChannel().writeAndFlush(taskRejectAckMessage.convert2Command()); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskResultEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskResultEventHandler.java index b50a81311d..5f36248d9e 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskResultEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskResultEventHandler.java @@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.enums.TaskEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.utils.TaskInstanceUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; @@ -60,23 +59,23 @@ public class TaskResultEventHandler implements TaskEventHandler { int processInstanceId = taskEvent.getProcessInstanceId(); WorkflowExecuteRunnable workflowExecuteRunnable = this.processInstanceExecCacheManager.getByProcessInstanceId( - processInstanceId); + processInstanceId); if (workflowExecuteRunnable == null) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task result event error, cannot find related workflow instance from cache, will discard this event"); + "Handle task result event error, cannot find related workflow instance from cache, will discard this event"); } Optional taskInstanceOptional = workflowExecuteRunnable.getTaskInstance(taskInstanceId); if (!taskInstanceOptional.isPresent()) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task result event error, cannot find the taskInstance from cache, will discord this event"); + "Handle task result event error, cannot find the taskInstance from cache, will discord this event"); } TaskInstance taskInstance = taskInstanceOptional.get(); - if (taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState().isFinished()) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task result event error, the task instance is already finished, will discord this event"); + "Handle task result event error, the task instance is already finished, will discord this event"); } dataQualityResultOperator.operateDqExecuteResult(taskEvent, taskInstance); @@ -99,22 +98,23 @@ public class TaskResultEventHandler implements TaskEventHandler { TaskInstanceUtils.copyTaskInstance(oldTaskInstance, taskInstance); throw new TaskEventHandleError("Handle task result event error, save taskInstance to db error", ex); } - StateEvent stateEvent = new StateEvent(); - stateEvent.setProcessInstanceId(taskEvent.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskEvent.getTaskInstanceId()); - stateEvent.setExecutionStatus(taskEvent.getState()); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskEvent.getProcessInstanceId()) + .taskInstanceId(taskEvent.getTaskInstanceId()) + .status(taskEvent.getState()) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } public void sendAckToWorker(TaskEvent taskEvent) { // we didn't set the receiver address, since the ack doen's need to retry - TaskExecuteAckCommand taskExecuteAckMessage = new TaskExecuteAckCommand(ExecutionStatus.SUCCESS, - taskEvent.getTaskInstanceId(), - masterConfig.getMasterAddress(), - taskEvent.getWorkerAddress(), - System.currentTimeMillis()); + TaskExecuteAckCommand taskExecuteAckMessage = new TaskExecuteAckCommand(true, + taskEvent.getTaskInstanceId(), + masterConfig.getMasterAddress(), + taskEvent.getWorkerAddress(), + System.currentTimeMillis()); taskEvent.getChannel().writeAndFlush(taskExecuteAckMessage.convert2Command()); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java index f6f7069ab3..1ac198497f 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRetryStateEventHandler.java @@ -17,6 +17,7 @@ package org.apache.dolphinscheduler.server.master.event; +import com.google.auto.service.AutoService; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.server.master.metrics.TaskMetrics; @@ -24,19 +25,20 @@ import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import java.util.Map; -import com.google.auto.service.AutoService; - @AutoService(StateEventHandler.class) public class TaskRetryStateEventHandler implements StateEventHandler { + @Override - public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, StateEvent stateEvent) - throws StateEventHandleException { + public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, + StateEvent stateEvent) throws StateEventHandleException { + TaskStateEvent taskStateEvent = (TaskStateEvent) stateEvent; + TaskMetrics.incTaskInstanceByState("retry"); Map waitToRetryTaskInstanceMap = workflowExecuteRunnable.getWaitToRetryTaskInstanceMap(); - TaskInstance taskInstance = waitToRetryTaskInstanceMap.get(stateEvent.getTaskCode()); + TaskInstance taskInstance = waitToRetryTaskInstanceMap.get(taskStateEvent.getTaskCode()); workflowExecuteRunnable.addTaskToStandByList(taskInstance); workflowExecuteRunnable.submitStandByTask(); - waitToRetryTaskInstanceMap.remove(stateEvent.getTaskCode()); + waitToRetryTaskInstanceMap.remove(taskStateEvent.getTaskCode()); return true; } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRunningEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRunningEventHandler.java index a4de2d4b44..fe449a9f6f 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRunningEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskRunningEventHandler.java @@ -21,23 +21,22 @@ import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.enums.TaskEventType; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.utils.TaskInstanceUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningAckMessage; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.processor.queue.TaskEvent; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool; import org.apache.dolphinscheduler.service.process.ProcessService; - -import java.util.Optional; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Optional; + @Component public class TaskRunningEventHandler implements TaskEventHandler { + private final Logger logger = LoggerFactory.getLogger(TaskRunningEventHandler.class); @Autowired @@ -55,23 +54,23 @@ public class TaskRunningEventHandler implements TaskEventHandler { int processInstanceId = taskEvent.getProcessInstanceId(); WorkflowExecuteRunnable workflowExecuteRunnable = - this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + this.processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteRunnable == null) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task running event error, cannot find related workflow instance from cache, will discard this event"); + "Handle task running event error, cannot find related workflow instance from cache, will discard this event"); } Optional taskInstanceOptional = workflowExecuteRunnable.getTaskInstance(taskInstanceId); if (!taskInstanceOptional.isPresent()) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle running event error, cannot find the taskInstance from cache, will discord this event"); + "Handle running event error, cannot find the taskInstance from cache, will discord this event"); } TaskInstance taskInstance = taskInstanceOptional.get(); - if (taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState().isFinished()) { sendAckToWorker(taskEvent); throw new TaskEventHandleError( - "Handle task running event error, this task instance is already finished, this event is delay, will discard this event"); + "Handle task running event error, this task instance is already finished, this event is delay, will discard this event"); } TaskInstance oldTaskInstance = new TaskInstance(); @@ -96,18 +95,19 @@ public class TaskRunningEventHandler implements TaskEventHandler { throw new TaskEventHandleError("Handle task running event error, update taskInstance to db failed", ex); } - StateEvent stateEvent = new StateEvent(); - stateEvent.setProcessInstanceId(taskEvent.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskEvent.getTaskInstanceId()); - stateEvent.setExecutionStatus(taskEvent.getState()); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskEvent.getProcessInstanceId()) + .taskInstanceId(taskEvent.getTaskInstanceId()) + .status(taskEvent.getState()) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } private void sendAckToWorker(TaskEvent taskEvent) { // If event handle success, send ack to worker to otherwise the worker will retry this event TaskExecuteRunningAckMessage taskExecuteRunningAckMessage = - new TaskExecuteRunningAckMessage(ExecutionStatus.SUCCESS, taskEvent.getTaskInstanceId()); + new TaskExecuteRunningAckMessage(true, taskEvent.getTaskInstanceId()); taskEvent.getChannel().writeAndFlush(taskExecuteRunningAckMessage.convert2Command()); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEvent.java new file mode 100644 index 0000000000..1ad96b9346 --- /dev/null +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEvent.java @@ -0,0 +1,52 @@ +/* + * 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.apache.dolphinscheduler.server.master.event; + +import io.netty.channel.Channel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.NonNull; +import org.apache.dolphinscheduler.common.enums.StateEventType; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TaskStateEvent implements StateEvent { + + // todo: use wrapper type + private int processInstanceId; + + private int taskInstanceId; + + private long taskCode; + + private TaskExecutionStatus status; + + private @NonNull StateEventType type; + + private String key; + + private Channel channel; + + private String context; + +} diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java index 9854f95605..417d2ddec4 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskStateEventHandler.java @@ -38,16 +38,17 @@ public class TaskStateEventHandler implements StateEventHandler { private static final Logger logger = LoggerFactory.getLogger(TaskStateEventHandler.class); @Override - public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, StateEvent stateEvent) - throws StateEventHandleException, StateEventHandleError { - measureTaskState(stateEvent); - workflowExecuteRunnable.checkTaskInstanceByStateEvent(stateEvent); + public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, + StateEvent stateEvent) throws StateEventHandleException, StateEventHandleError { + TaskStateEvent taskStateEvent = (TaskStateEvent) stateEvent; + measureTaskState(taskStateEvent); + workflowExecuteRunnable.checkTaskInstanceByStateEvent(taskStateEvent); Optional taskInstanceOptional = - workflowExecuteRunnable.getTaskInstance(stateEvent.getTaskInstanceId()); + workflowExecuteRunnable.getTaskInstance(taskStateEvent.getTaskInstanceId()); TaskInstance task = taskInstanceOptional.orElseThrow(() -> new StateEventHandleError( - "Cannot find task instance from taskMap by task instance id: " + stateEvent.getTaskInstanceId())); + "Cannot find task instance from taskMap by task instance id: " + taskStateEvent.getTaskInstanceId())); if (task.getState() == null) { throw new StateEventHandleError("Task state event handle error due to task state is null"); @@ -55,9 +56,9 @@ public class TaskStateEventHandler implements StateEventHandler { Map completeTaskMap = workflowExecuteRunnable.getCompleteTaskMap(); - if (task.getState().typeIsFinished()) { + if (task.getState().isFinished()) { if (completeTaskMap.containsKey(task.getTaskCode()) - && completeTaskMap.get(task.getTaskCode()) == task.getId()) { + && completeTaskMap.get(task.getTaskCode()) == task.getId()) { logger.warn("The task instance is already complete, stateEvent: {}", stateEvent); return true; } @@ -73,7 +74,7 @@ public class TaskStateEventHandler implements StateEventHandler { ITaskProcessor iTaskProcessor = activeTaskProcessMap.get(task.getTaskCode()); iTaskProcessor.action(TaskAction.RUN); - if (iTaskProcessor.taskInstance().getState().typeIsFinished()) { + if (iTaskProcessor.taskInstance().getState().isFinished()) { if (iTaskProcessor.taskInstance().getState() != task.getState()) { task.setState(iTaskProcessor.taskInstance().getState()); } @@ -82,7 +83,7 @@ public class TaskStateEventHandler implements StateEventHandler { return true; } throw new StateEventHandleException( - "Task state event handle error, due to the task is not in activeTaskProcessorMaps"); + "Task state event handle error, due to the task is not in activeTaskProcessorMaps"); } @Override @@ -90,18 +91,18 @@ public class TaskStateEventHandler implements StateEventHandler { return StateEventType.TASK_STATE_CHANGE; } - private void measureTaskState(StateEvent taskStateEvent) { - if (taskStateEvent == null || taskStateEvent.getExecutionStatus() == null) { + private void measureTaskState(TaskStateEvent taskStateEvent) { + if (taskStateEvent == null || taskStateEvent.getStatus() == null) { // the event is broken logger.warn("The task event is broken..., taskEvent: {}", taskStateEvent); return; } - if (taskStateEvent.getExecutionStatus().typeIsFinished()) { + if (taskStateEvent.getStatus().isFinished()) { TaskMetrics.incTaskInstanceByState("finish"); } - switch (taskStateEvent.getExecutionStatus()) { - case STOP: - TaskMetrics.incTaskInstanceByState("stop"); + switch (taskStateEvent.getStatus()) { + case KILL: + TaskMetrics.incTaskInstanceByState("kill"); break; case SUCCESS: TaskMetrics.incTaskInstanceByState("success"); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskTimeoutStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskTimeoutStateEventHandler.java index c43c0bcbf2..22f3f9dd8f 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskTimeoutStateEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/TaskTimeoutStateEventHandler.java @@ -17,6 +17,7 @@ package org.apache.dolphinscheduler.server.master.event; +import com.google.auto.service.AutoService; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.dao.entity.TaskInstance; @@ -28,17 +29,22 @@ import org.apache.dolphinscheduler.server.master.runner.task.TaskAction; import java.util.Map; -import com.google.auto.service.AutoService; - @AutoService(StateEventHandler.class) public class TaskTimeoutStateEventHandler implements StateEventHandler { - @Override - public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, StateEvent stateEvent) - throws StateEventHandleError { - TaskMetrics.incTaskInstanceByState("timeout"); - workflowExecuteRunnable.checkTaskInstanceByStateEvent(stateEvent); - TaskInstance taskInstance = workflowExecuteRunnable.getTaskInstance(stateEvent.getTaskInstanceId()).get(); + @Override + public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, + StateEvent stateEvent) throws StateEventHandleError { + TaskStateEvent taskStateEvent = (TaskStateEvent) stateEvent; + + TaskMetrics.incTaskInstanceByState("timeout"); + workflowExecuteRunnable.checkTaskInstanceByStateEvent(taskStateEvent); + + TaskInstance taskInstance = + workflowExecuteRunnable.getTaskInstance(taskStateEvent.getTaskInstanceId()).orElseThrow( + () -> new StateEventHandleError(String.format( + "Cannot find the task instance from workflow execute runnable, taskInstanceId: %s", + taskStateEvent.getTaskInstanceId()))); if (TimeoutFlag.CLOSE == taskInstance.getTaskDefine().getTimeoutFlag()) { return true; @@ -46,7 +52,7 @@ public class TaskTimeoutStateEventHandler implements StateEventHandler { TaskTimeoutStrategy taskTimeoutStrategy = taskInstance.getTaskDefine().getTimeoutNotifyStrategy(); Map activeTaskProcessMap = workflowExecuteRunnable.getActiveTaskProcessMap(); if (TaskTimeoutStrategy.FAILED == taskTimeoutStrategy - || TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) { + || TaskTimeoutStrategy.WARNFAILED == taskTimeoutStrategy) { ITaskProcessor taskProcessor = activeTaskProcessMap.get(taskInstance.getTaskCode()); taskProcessor.action(TaskAction.TIMEOUT); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java index c598cb5a90..8c5e27c117 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java @@ -50,32 +50,30 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler { private WorkflowEventQueue workflowEventQueue; @Override - public void handleWorkflowEvent(WorkflowEvent workflowEvent) throws WorkflowEventHandleError { + public void handleWorkflowEvent(final WorkflowEvent workflowEvent) throws WorkflowEventHandleError { logger.info("Handle workflow start event, begin to start a workflow, event: {}", workflowEvent); - WorkflowExecuteRunnable workflowExecuteRunnable = - processInstanceExecCacheManager.getByProcessInstanceId(workflowEvent.getWorkflowInstanceId()); + WorkflowExecuteRunnable workflowExecuteRunnable = processInstanceExecCacheManager.getByProcessInstanceId( + workflowEvent.getWorkflowInstanceId()); if (workflowExecuteRunnable == null) { throw new WorkflowEventHandleError( "The workflow start event is invalid, cannot find the workflow instance from cache"); } - ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance(); ProcessInstanceMetrics.incProcessInstanceByState("submit"); - CompletableFuture workflowSubmitFuture = - CompletableFuture.supplyAsync(workflowExecuteRunnable::call, workflowExecuteThreadPool); - workflowSubmitFuture.thenAccept(workflowSubmitStatue -> { - if (WorkflowSubmitStatue.SUCCESS == workflowSubmitStatue) { - // submit failed will resend the event to workflow event queue - logger.info("Success submit the workflow instance"); - if (processInstance.getTimeout() > 0) { - stateWheelExecuteThread.addProcess4TimeoutCheck(processInstance); + ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance(); + CompletableFuture.supplyAsync(workflowExecuteRunnable::call, workflowExecuteThreadPool) + .thenAccept(workflowSubmitStatue -> { + if (WorkflowSubmitStatue.SUCCESS == workflowSubmitStatue) { + // submit failed will resend the event to workflow event queue + logger.info("Success submit the workflow instance"); + if (processInstance.getTimeout() > 0) { + stateWheelExecuteThread.addProcess4TimeoutCheck(processInstance); + } + } else { + logger.error("Failed to submit the workflow instance, will resend the workflow start event: {}", + workflowEvent); + workflowEventQueue.addEvent(workflowEvent); } - } else { - logger.error("Failed to submit the workflow instance, will resend the workflow start event: {}", - workflowEvent); - workflowEventQueue.addEvent(new WorkflowEvent(WorkflowEventType.START_WORKFLOW, - processInstance.getId())); - } - }); + }); } @Override diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java new file mode 100644 index 0000000000..3267108228 --- /dev/null +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java @@ -0,0 +1,48 @@ +/* + * 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.apache.dolphinscheduler.server.master.event; + +import io.netty.channel.Channel; +import lombok.*; +import org.apache.dolphinscheduler.common.enums.StateEventType; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class WorkflowStateEvent implements StateEvent { + + // todo: use wrapper type + private int processInstanceId; + + /** + * Some event may contains taskInstanceId + */ + private int taskInstanceId; + + private WorkflowExecutionStatus status; + + private @NonNull StateEventType type; + + private String key; + + private Channel channel; + + private String context; +} diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java index a37b3023a3..c3f49111a7 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEventHandler.java @@ -17,51 +17,49 @@ package org.apache.dolphinscheduler.server.master.event; +import com.google.auto.service.AutoService; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.server.master.metrics.ProcessInstanceMetrics; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.auto.service.AutoService; - @AutoService(StateEventHandler.class) public class WorkflowStateEventHandler implements StateEventHandler { private static final Logger logger = LoggerFactory.getLogger(WorkflowStateEventHandler.class); @Override - public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, StateEvent stateEvent) - throws StateEventHandleException { - measureProcessState(stateEvent); + public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable, + StateEvent stateEvent) throws StateEventHandleException { + WorkflowStateEvent workflowStateEvent = (WorkflowStateEvent) stateEvent; + measureProcessState(workflowStateEvent); ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance(); ProcessDefinition processDefinition = processInstance.getProcessDefinition(); logger.info( - "Handle workflow instance state event, the current workflow instance state {} will be changed to {}", - processInstance.getState(), stateEvent.getExecutionStatus()); + "Handle workflow instance state event, the current workflow instance state {} will be changed to {}", + processInstance.getState(), workflowStateEvent.getStatus()); - if (stateEvent.getExecutionStatus() == ExecutionStatus.STOP) { + if (workflowStateEvent.getStatus().isStop()) { // serial wait execution type needs to wake up the waiting process if (processDefinition.getExecutionType().typeIsSerialWait() || processDefinition.getExecutionType() - .typeIsSerialPriority()) { + .typeIsSerialPriority()) { workflowExecuteRunnable.endProcess(); return true; } - workflowExecuteRunnable.updateProcessInstanceState(stateEvent); + workflowExecuteRunnable.updateProcessInstanceState(workflowStateEvent); return true; } if (workflowExecuteRunnable.processComplementData()) { return true; } - if (stateEvent.getExecutionStatus().typeIsFinished()) { + if (workflowStateEvent.getStatus().isFinished()) { workflowExecuteRunnable.endProcess(); } - if (processInstance.getState() == ExecutionStatus.READY_STOP) { + if (processInstance.getState().isReadyStop()) { workflowExecuteRunnable.killAllTasks(); } @@ -73,11 +71,11 @@ public class WorkflowStateEventHandler implements StateEventHandler { return StateEventType.PROCESS_STATE_CHANGE; } - private void measureProcessState(StateEvent processStateEvent) { - if (processStateEvent.getExecutionStatus().typeIsFinished()) { + private void measureProcessState(WorkflowStateEvent processStateEvent) { + if (processStateEvent.getStatus().isFinished()) { ProcessInstanceMetrics.incProcessInstanceByState("finish"); } - switch (processStateEvent.getExecutionStatus()) { + switch (processStateEvent.getStatus()) { case STOP: ProcessInstanceMetrics.incProcessInstanceByState("stop"); break; diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/StateEventProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/StateEventProcessor.java index 18afd11ae5..9e859cd2e7 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/StateEventProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/StateEventProcessor.java @@ -17,26 +17,25 @@ package org.apache.dolphinscheduler.server.master.processor; +import com.google.common.base.Preconditions; +import io.netty.channel.Channel; import org.apache.dolphinscheduler.common.enums.StateEventType; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; -import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; +import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor; import org.apache.dolphinscheduler.server.master.event.StateEvent; +import org.apache.dolphinscheduler.server.master.event.TaskStateEvent; +import org.apache.dolphinscheduler.server.master.event.WorkflowStateEvent; import org.apache.dolphinscheduler.server.master.processor.queue.StateEventResponseService; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.google.common.base.Preconditions; - -import io.netty.channel.Channel; - /** * handle state event received from master/api */ @@ -50,25 +49,21 @@ public class StateEventProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { - Preconditions.checkArgument(CommandType.STATE_EVENT_REQUEST == command.getType(), String.format("invalid command type: %s", command.getType())); + Preconditions.checkArgument(CommandType.STATE_EVENT_REQUEST == command.getType(), + String.format("invalid command type: %s", command.getType())); - StateEventChangeCommand stateEventChangeCommand = JSONUtils.parseObject(command.getBody(), StateEventChangeCommand.class); - StateEvent stateEvent = new StateEvent(); - stateEvent.setKey(stateEventChangeCommand.getKey()); - if (stateEventChangeCommand.getSourceProcessInstanceId() != stateEventChangeCommand.getDestProcessInstanceId()) { - stateEvent.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + WorkflowStateEventChangeCommand workflowStateEventChangeCommand = + JSONUtils.parseObject(command.getBody(), WorkflowStateEventChangeCommand.class); + StateEvent stateEvent; + if (workflowStateEventChangeCommand.getDestTaskInstanceId() == 0) { + stateEvent = createWorkflowStateEvent(workflowStateEventChangeCommand); } else { - stateEvent.setExecutionStatus(stateEventChangeCommand.getSourceStatus()); + stateEvent = createTaskStateEvent(workflowStateEventChangeCommand); } - stateEvent.setProcessInstanceId(stateEventChangeCommand.getDestProcessInstanceId()); - stateEvent.setTaskInstanceId(stateEventChangeCommand.getDestTaskInstanceId()); - StateEventType - type = stateEvent.getTaskInstanceId() == 0 ? StateEventType.PROCESS_STATE_CHANGE : StateEventType.TASK_STATE_CHANGE; - stateEvent.setType(type); try { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), - stateEvent.getTaskInstanceId()); + stateEvent.getTaskInstanceId()); logger.info("Received state change command, event: {}", stateEvent); stateEventResponseService.addStateChangeEvent(stateEvent); @@ -78,4 +73,27 @@ public class StateEventProcessor implements NettyRequestProcessor { } + private TaskStateEvent createTaskStateEvent(WorkflowStateEventChangeCommand workflowStateEventChangeCommand) { + return TaskStateEvent.builder() + .processInstanceId(workflowStateEventChangeCommand.getDestProcessInstanceId()) + .taskInstanceId(workflowStateEventChangeCommand.getDestTaskInstanceId()) + .type(StateEventType.TASK_STATE_CHANGE) + .key(workflowStateEventChangeCommand.getKey()) + .build(); + } + + private WorkflowStateEvent createWorkflowStateEvent(WorkflowStateEventChangeCommand workflowStateEventChangeCommand) { + WorkflowExecutionStatus workflowExecutionStatus = workflowStateEventChangeCommand.getSourceStatus(); + if (workflowStateEventChangeCommand.getSourceProcessInstanceId() != workflowStateEventChangeCommand + .getDestProcessInstanceId()) { + workflowExecutionStatus = WorkflowExecutionStatus.RUNNING_EXECUTION; + } + return WorkflowStateEvent.builder() + .processInstanceId(workflowStateEventChangeCommand.getDestProcessInstanceId()) + .type(StateEventType.PROCESS_STATE_CHANGE) + .status(workflowExecutionStatus) + .key(workflowStateEventChangeCommand.getKey()) + .build(); + } + } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskEventProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskEventProcessor.java index 42d4ab4db7..22faf7f05a 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskEventProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskEventProcessor.java @@ -17,7 +17,8 @@ package org.apache.dolphinscheduler.server.master.processor; -import org.apache.dolphinscheduler.server.master.event.StateEvent; +import com.google.common.base.Preconditions; +import io.netty.channel.Channel; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.LoggerUtils; @@ -25,17 +26,13 @@ import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor; +import org.apache.dolphinscheduler.server.master.event.TaskStateEvent; import org.apache.dolphinscheduler.server.master.processor.queue.StateEventResponseService; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.google.common.base.Preconditions; - -import io.netty.channel.Channel; - /** * handle state event received from master/api */ @@ -50,17 +47,20 @@ public class TaskEventProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_FORCE_STATE_EVENT_REQUEST == command.getType() - || CommandType.TASK_WAKEUP_EVENT_REQUEST == command.getType() - , String.format("invalid command type: %s", command.getType())); + || CommandType.TASK_WAKEUP_EVENT_REQUEST == command.getType(), + String.format("invalid command type: %s", command.getType())); - TaskEventChangeCommand taskEventChangeCommand = JSONUtils.parseObject(command.getBody(), TaskEventChangeCommand.class); - StateEvent stateEvent = new StateEvent(); - stateEvent.setKey(taskEventChangeCommand.getKey()); - stateEvent.setProcessInstanceId(taskEventChangeCommand.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskEventChangeCommand.getTaskInstanceId()); - stateEvent.setType(StateEventType.WAIT_TASK_GROUP); + TaskEventChangeCommand taskEventChangeCommand = + JSONUtils.parseObject(command.getBody(), TaskEventChangeCommand.class); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskEventChangeCommand.getProcessInstanceId()) + .taskInstanceId(taskEventChangeCommand.getTaskInstanceId()) + .key(taskEventChangeCommand.getKey()) + .type(StateEventType.WAIT_TASK_GROUP) + .build(); try { - LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), stateEvent.getTaskInstanceId()); + LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), + stateEvent.getTaskInstanceId()); logger.info("Received task event change command, event: {}", stateEvent); stateEventResponseService.addEvent2WorkflowExecute(stateEvent); } finally { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java index a09d661ebd..282219b8ec 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java @@ -17,30 +17,26 @@ package org.apache.dolphinscheduler.server.master.processor.queue; -import org.apache.dolphinscheduler.server.master.event.StateEvent; +import io.netty.channel.Channel; import org.apache.dolphinscheduler.common.thread.BaseDaemonThread; import org.apache.dolphinscheduler.common.thread.Stopper; import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.StateEventResponseCommand; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; +import org.apache.dolphinscheduler.server.master.event.StateEvent; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import io.netty.channel.Channel; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; @Component public class StateEventResponseService { @@ -80,7 +76,8 @@ public class StateEventResponseService { eventQueue.drainTo(remainEvents); for (StateEvent event : remainEvents) { try { - LoggerUtils.setWorkflowAndTaskInstanceIDMDC(event.getProcessInstanceId(), event.getTaskInstanceId()); + LoggerUtils.setWorkflowAndTaskInstanceIDMDC(event.getProcessInstanceId(), + event.getTaskInstanceId()); this.persist(event); } finally { @@ -119,7 +116,8 @@ public class StateEventResponseService { try { // if not task , blocking here StateEvent stateEvent = eventQueue.take(); - LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), stateEvent.getTaskInstanceId()); + LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), + stateEvent.getTaskInstanceId()); persist(stateEvent); } catch (InterruptedException e) { logger.warn("State event loop service interrupted, will stop this loop", e); @@ -133,10 +131,10 @@ public class StateEventResponseService { } } - private void writeResponse(StateEvent stateEvent, ExecutionStatus status) { + private void writeResponse(StateEvent stateEvent) { Channel channel = stateEvent.getChannel(); if (channel != null) { - StateEventResponseCommand command = new StateEventResponseCommand(status, stateEvent.getKey()); + StateEventResponseCommand command = new StateEventResponseCommand(stateEvent.getKey()); channel.writeAndFlush(command.convert2Command()); } } @@ -145,12 +143,13 @@ public class StateEventResponseService { try { if (!this.processInstanceExecCacheManager.contains(stateEvent.getProcessInstanceId())) { logger.warn("Persist event into workflow execute thread error, " - + "cannot find the workflow instance from cache manager, event: {}", stateEvent); - writeResponse(stateEvent, ExecutionStatus.FAILURE); + + "cannot find the workflow instance from cache manager, event: {}", stateEvent); + writeResponse(stateEvent); return; } - WorkflowExecuteRunnable workflowExecuteThread = this.processInstanceExecCacheManager.getByProcessInstanceId(stateEvent.getProcessInstanceId()); + WorkflowExecuteRunnable workflowExecuteThread = + this.processInstanceExecCacheManager.getByProcessInstanceId(stateEvent.getProcessInstanceId()); // We will refresh the task instance status first, if the refresh failed the event will not be removed switch (stateEvent.getType()) { case TASK_STATE_CHANGE: @@ -162,7 +161,8 @@ public class StateEventResponseService { default: } workflowExecuteThreadPool.submitStateEvent(stateEvent); - writeResponse(stateEvent, ExecutionStatus.SUCCESS); + // this response is not needed. + writeResponse(stateEvent); } catch (Exception e) { logger.error("Persist event queue error, event: {}", stateEvent, e); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskEvent.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskEvent.java index 1a367a96a2..9f6679c9d8 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskEvent.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskEvent.java @@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.server.master.processor.queue; import org.apache.dolphinscheduler.common.enums.TaskEventType; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteResultCommand; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningCommand; import org.apache.dolphinscheduler.remote.command.TaskRejectCommand; @@ -47,7 +47,7 @@ public class TaskEvent { /** * state */ - private ExecutionStatus state; + private TaskExecutionStatus state; /** * start time @@ -123,7 +123,7 @@ public class TaskEvent { TaskEvent event = new TaskEvent(); event.setProcessInstanceId(command.getProcessInstanceId()); event.setTaskInstanceId(command.getTaskInstanceId()); - event.setState(ExecutionStatus.of(command.getStatus())); + event.setState(TaskExecutionStatus.of(command.getStatus())); event.setStartTime(command.getStartTime()); event.setExecutePath(command.getExecutePath()); event.setLogPath(command.getLogPath()); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterConnectionStateListener.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterConnectionStateListener.java index bc1b217f9e..d0b86fc660 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterConnectionStateListener.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterConnectionStateListener.java @@ -17,8 +17,6 @@ package org.apache.dolphinscheduler.server.master.registry; -import static com.google.common.base.Preconditions.checkNotNull; - import org.apache.dolphinscheduler.registry.api.ConnectionListener; import org.apache.dolphinscheduler.registry.api.ConnectionState; import org.apache.dolphinscheduler.service.registry.RegistryClient; @@ -26,6 +24,8 @@ import org.apache.dolphinscheduler.service.registry.RegistryClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import lombok.NonNull; + public class MasterConnectionStateListener implements ConnectionListener { private static final Logger logger = LoggerFactory.getLogger(MasterConnectionStateListener.class); @@ -33,9 +33,9 @@ public class MasterConnectionStateListener implements ConnectionListener { private final String masterNodePath; private final RegistryClient registryClient; - public MasterConnectionStateListener(String masterNodePath, RegistryClient registryClient) { - this.masterNodePath = checkNotNull(masterNodePath); - this.registryClient = checkNotNull(registryClient); + public MasterConnectionStateListener(@NonNull String masterNodePath, @NonNull RegistryClient registryClient) { + this.masterNodePath = masterNodePath; + this.registryClient = registryClient; } @Override diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java index aa536bae49..722a322288 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java @@ -219,10 +219,9 @@ public class MasterRegistryClient implements AutoCloseable { public void deregister() { try { - String address = getLocalAddress(); String localNodePath = getCurrentNodePath(); registryClient.remove(localNodePath); - logger.info("Master node : {} unRegistry to register center.", address); + logger.info("Master node : {} unRegistry to register center.", masterAddress); heartBeatExecutor.shutdown(); logger.info("MasterServer heartbeat executor shutdown"); registryClient.close(); @@ -235,15 +234,7 @@ public class MasterRegistryClient implements AutoCloseable { * get master path */ private String getCurrentNodePath() { - String address = getLocalAddress(); - return REGISTRY_DOLPHINSCHEDULER_MASTERS + "/" + address; - } - - /** - * get local address - */ - private String getLocalAddress() { - return NetUtils.getAddr(masterConfig.getListenPort()); + return REGISTRY_DOLPHINSCHEDULER_MASTERS + "/" + masterAddress; } } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java index c053cb238b..9ea9b6574b 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java @@ -17,9 +17,11 @@ package org.apache.dolphinscheduler.server.master.runner; +import lombok.NonNull; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.thread.BaseDaemonThread; import org.apache.dolphinscheduler.common.thread.Stopper; import org.apache.dolphinscheduler.common.utils.DateUtils; @@ -27,23 +29,20 @@ import org.apache.dolphinscheduler.common.utils.LoggerUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; -import org.apache.dolphinscheduler.server.master.event.StateEvent; +import org.apache.dolphinscheduler.server.master.event.TaskStateEvent; +import org.apache.dolphinscheduler.server.master.event.WorkflowStateEvent; import org.apache.dolphinscheduler.server.master.runner.task.TaskInstanceKey; - -import java.util.Optional; -import java.util.concurrent.ConcurrentLinkedQueue; - -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import lombok.NonNull; +import javax.annotation.PostConstruct; +import java.util.Optional; +import java.util.concurrent.ConcurrentLinkedQueue; /** * Check thread @@ -137,10 +136,10 @@ public class StateWheelExecuteThread extends BaseDaemonThread { try { LoggerUtils.setWorkflowInstanceIdMDC(processInstanceId); WorkflowExecuteRunnable workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId( - processInstanceId); + processInstanceId); if (workflowExecuteThread == null) { logger.warn( - "Check workflow timeout failed, can not find workflowExecuteThread from cache manager, will remove this workflowInstance from check list"); + "Check workflow timeout failed, can not find workflowExecuteThread from cache manager, will remove this workflowInstance from check list"); processInstanceTimeoutCheckList.remove(processInstanceId); continue; } @@ -150,8 +149,8 @@ public class StateWheelExecuteThread extends BaseDaemonThread { continue; } long timeRemain = DateUtils.getRemainTime(processInstance.getStartTime(), - (long) processInstance.getTimeout() - * Constants.SEC_2_MINUTES_TIME_UNIT); + (long) processInstance.getTimeout() + * Constants.SEC_2_MINUTES_TIME_UNIT); if (timeRemain < 0) { logger.info("Workflow instance timeout, adding timeout event"); addProcessTimeoutEvent(processInstance); @@ -208,7 +207,7 @@ public class StateWheelExecuteThread extends BaseDaemonThread { } taskInstanceRetryCheckList.add(taskInstanceKey); logger.info("[WorkflowInstance-{}][TaskInstance-{}] Added task instance into retry check list", - processInstance.getId(), taskInstance.getId()); + processInstance.getId(), taskInstance.getId()); } public void removeTask4RetryCheck(@NonNull ProcessInstance processInstance, @NonNull TaskInstance taskInstance) { @@ -246,26 +245,29 @@ public class StateWheelExecuteThread extends BaseDaemonThread { LoggerUtils.setWorkflowInstanceIdMDC(processInstanceId); long taskCode = taskInstanceKey.getTaskCode(); - WorkflowExecuteRunnable workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + WorkflowExecuteRunnable workflowExecuteThread = + processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteThread == null) { - logger.warn("Check task instance timeout failed, can not find workflowExecuteThread from cache manager, will remove this check task"); + logger.warn( + "Check task instance timeout failed, can not find workflowExecuteThread from cache manager, will remove this check task"); taskInstanceTimeoutCheckList.remove(taskInstanceKey); continue; } - Optional taskInstanceOptional = workflowExecuteThread.getActiveTaskInstanceByTaskCode(taskCode); + Optional taskInstanceOptional = + workflowExecuteThread.getActiveTaskInstanceByTaskCode(taskCode); if (!taskInstanceOptional.isPresent()) { logger.warn( - "Check task instance timeout failed, can not get taskInstance from workflowExecuteThread, taskCode: {}" - + "will remove this check task", - taskCode); + "Check task instance timeout failed, can not get taskInstance from workflowExecuteThread, taskCode: {}" + + "will remove this check task", + taskCode); taskInstanceTimeoutCheckList.remove(taskInstanceKey); continue; } TaskInstance taskInstance = taskInstanceOptional.get(); if (TimeoutFlag.OPEN == taskInstance.getTaskDefine().getTimeoutFlag()) { long timeRemain = DateUtils.getRemainTime(taskInstance.getStartTime(), - (long) taskInstance.getTaskDefine().getTimeout() - * Constants.SEC_2_MINUTES_TIME_UNIT); + (long) taskInstance.getTaskDefine().getTimeout() + * Constants.SEC_2_MINUTES_TIME_UNIT); if (timeRemain < 0) { logger.info("Task instance is timeout, adding task timeout event and remove the check"); addTaskTimeoutEvent(taskInstance); @@ -291,21 +293,24 @@ public class StateWheelExecuteThread extends BaseDaemonThread { try { LoggerUtils.setWorkflowInstanceIdMDC(processInstanceId); - WorkflowExecuteRunnable workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + WorkflowExecuteRunnable workflowExecuteThread = + processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteThread == null) { logger.warn( - "Task instance retry check failed, can not find workflowExecuteThread from cache manager, " - + "will remove this check task"); + "Task instance retry check failed, can not find workflowExecuteThread from cache manager, " + + "will remove this check task"); taskInstanceRetryCheckList.remove(taskInstanceKey); continue; } - Optional taskInstanceOptional = workflowExecuteThread.getRetryTaskInstanceByTaskCode(taskCode); + Optional taskInstanceOptional = + workflowExecuteThread.getRetryTaskInstanceByTaskCode(taskCode); ProcessInstance processInstance = workflowExecuteThread.getProcessInstance(); - if (processInstance.getState() == ExecutionStatus.READY_STOP) { - logger.warn("The process instance is ready to stop, will send process stop event and remove the check task"); + if (processInstance.getState().isReadyStop()) { + logger.warn( + "The process instance is ready to stop, will send process stop event and remove the check task"); addProcessStopEvent(processInstance); taskInstanceRetryCheckList.remove(taskInstanceKey); break; @@ -313,22 +318,24 @@ public class StateWheelExecuteThread extends BaseDaemonThread { if (!taskInstanceOptional.isPresent()) { logger.warn( - "Task instance retry check failed, can not find taskInstance from workflowExecuteThread, will remove this check"); + "Task instance retry check failed, can not find taskInstance from workflowExecuteThread, will remove this check"); taskInstanceRetryCheckList.remove(taskInstanceKey); continue; } TaskInstance taskInstance = taskInstanceOptional.get(); - // We check the status to avoid when we do worker failover we submit a failover task, this task may be resubmit by this + // We check the status to avoid when we do worker failover we submit a failover task, this task may be + // resubmit by this // thread - if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE - && taskInstance.retryTaskIntervalOverTime()) { + if (taskInstance.getState() != TaskExecutionStatus.NEED_FAULT_TOLERANCE + && taskInstance.retryTaskIntervalOverTime()) { // reset taskInstance endTime and state - // todo relative funtion: TaskInstance.retryTaskIntervalOverTime, WorkflowExecuteThread.cloneRetryTaskInstance + // todo relative funtion: TaskInstance.retryTaskIntervalOverTime, + // WorkflowExecuteThread.cloneRetryTaskInstance logger.info("[TaskInstance-{}]The task instance can retry, will retry this task instance", - taskInstance.getId()); + taskInstance.getId()); taskInstance.setEndTime(null); - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); addTaskRetryEvent(taskInstance); taskInstanceRetryCheckList.remove(taskInstanceKey); @@ -351,21 +358,24 @@ public class StateWheelExecuteThread extends BaseDaemonThread { try { LoggerUtils.setTaskInstanceIdMDC(processInstanceId); - WorkflowExecuteRunnable workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); + WorkflowExecuteRunnable workflowExecuteThread = + processInstanceExecCacheManager.getByProcessInstanceId(processInstanceId); if (workflowExecuteThread == null) { - logger.warn("Task instance state check failed, can not find workflowExecuteThread from cache manager, will remove this check task"); + logger.warn( + "Task instance state check failed, can not find workflowExecuteThread from cache manager, will remove this check task"); taskInstanceStateCheckList.remove(taskInstanceKey); continue; } - Optional taskInstanceOptional = workflowExecuteThread.getActiveTaskInstanceByTaskCode(taskCode); + Optional taskInstanceOptional = + workflowExecuteThread.getActiveTaskInstanceByTaskCode(taskCode); if (!taskInstanceOptional.isPresent()) { logger.warn( - "Task instance state check failed, can not find taskInstance from workflowExecuteThread, will remove this check event"); + "Task instance state check failed, can not find taskInstance from workflowExecuteThread, will remove this check event"); taskInstanceStateCheckList.remove(taskInstanceKey); continue; } TaskInstance taskInstance = taskInstanceOptional.get(); - if (taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState().isFinished()) { continue; } addTaskStateChangeEvent(taskInstance); @@ -378,46 +388,51 @@ public class StateWheelExecuteThread extends BaseDaemonThread { } private void addTaskStateChangeEvent(TaskInstance taskInstance) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); - stateEvent.setProcessInstanceId(taskInstance.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setTaskCode(taskInstance.getTaskCode()); - stateEvent.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskInstance.getProcessInstanceId()) + .taskInstanceId(taskInstance.getId()) + .taskCode(taskInstance.getTaskCode()) + .type(StateEventType.TASK_STATE_CHANGE) + .status(TaskExecutionStatus.RUNNING_EXECUTION) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } private void addProcessStopEvent(ProcessInstance processInstance) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE); - stateEvent.setProcessInstanceId(processInstance.getId()); - stateEvent.setExecutionStatus(ExecutionStatus.STOP); + WorkflowStateEvent stateEvent = WorkflowStateEvent.builder() + .processInstanceId(processInstance.getId()) + .type(StateEventType.PROCESS_STATE_CHANGE) + .status(WorkflowExecutionStatus.STOP) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } private void addTaskRetryEvent(TaskInstance taskInstance) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.TASK_RETRY); - stateEvent.setProcessInstanceId(taskInstance.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setTaskCode(taskInstance.getTaskCode()); - stateEvent.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskInstance.getProcessInstanceId()) + .taskInstanceId(taskInstance.getId()) + .taskCode(taskInstance.getTaskCode()) + .status(TaskExecutionStatus.RUNNING_EXECUTION) + .type(StateEventType.TASK_RETRY) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } private void addTaskTimeoutEvent(TaskInstance taskInstance) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.TASK_TIMEOUT); - stateEvent.setProcessInstanceId(taskInstance.getProcessInstanceId()); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setTaskCode(taskInstance.getTaskCode()); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(taskInstance.getProcessInstanceId()) + .taskInstanceId(taskInstance.getId()) + .type(StateEventType.TASK_TIMEOUT) + .taskCode(taskInstance.getTaskCode()) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } private void addProcessTimeoutEvent(ProcessInstance processInstance) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.PROCESS_TIMEOUT); - stateEvent.setProcessInstanceId(processInstance.getId()); + WorkflowStateEvent stateEvent = WorkflowStateEvent.builder() + .processInstanceId(processInstance.getId()) + .type(StateEventType.PROCESS_TIMEOUT) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java index 22e79daa6d..19b1ab5984 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java @@ -31,13 +31,7 @@ import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN; import org.apache.dolphinscheduler.common.Constants; -import org.apache.dolphinscheduler.common.enums.CommandType; -import org.apache.dolphinscheduler.common.enums.FailureStrategy; -import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.common.enums.Priority; -import org.apache.dolphinscheduler.common.enums.StateEventType; -import org.apache.dolphinscheduler.common.enums.TaskDependType; -import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus; +import org.apache.dolphinscheduler.common.enums.*; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; @@ -60,17 +54,13 @@ import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.utils.DagHelper; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.remote.command.HostUpdateCommand; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.server.master.config.MasterConfig; import org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager; -import org.apache.dolphinscheduler.server.master.event.StateEvent; -import org.apache.dolphinscheduler.server.master.event.StateEventHandleError; -import org.apache.dolphinscheduler.server.master.event.StateEventHandleException; -import org.apache.dolphinscheduler.server.master.event.StateEventHandler; -import org.apache.dolphinscheduler.server.master.event.StateEventHandlerManager; +import org.apache.dolphinscheduler.server.master.event.*; import org.apache.dolphinscheduler.server.master.metrics.TaskMetrics; import org.apache.dolphinscheduler.server.master.runner.task.ITaskProcessor; import org.apache.dolphinscheduler.server.master.runner.task.TaskAction; @@ -137,7 +127,6 @@ public class WorkflowExecuteRunnable implements Callable { */ private String key; - private WorkflowRunnableStatus workflowRunnableStatus = WorkflowRunnableStatus.CREATED; /** @@ -225,13 +214,13 @@ public class WorkflowExecuteRunnable implements Callable { * @param stateWheelExecuteThread stateWheelExecuteThread */ public WorkflowExecuteRunnable( - @NonNull ProcessInstance processInstance, - @NonNull ProcessService processService, - @NonNull NettyExecutorManager nettyExecutorManager, - @NonNull ProcessAlertManager processAlertManager, - @NonNull MasterConfig masterConfig, - @NonNull StateWheelExecuteThread stateWheelExecuteThread, - @NonNull CuringParamsService curingParamsService) { + @NonNull ProcessInstance processInstance, + @NonNull ProcessService processService, + @NonNull NettyExecutorManager nettyExecutorManager, + @NonNull ProcessAlertManager processAlertManager, + @NonNull MasterConfig masterConfig, + @NonNull StateWheelExecuteThread stateWheelExecuteThread, + @NonNull CuringParamsService curingParamsService) { this.processService = processService; this.processInstance = processInstance; this.nettyExecutorManager = nettyExecutorManager; @@ -255,8 +244,8 @@ public class WorkflowExecuteRunnable implements Callable { public void handleEvents() { if (!isStart()) { logger.info( - "The workflow instance is not started, will not handle its state event, current state event size: {}", - stateEvents); + "The workflow instance is not started, will not handle its state event, current state event size: {}", + stateEvents); return; } StateEvent stateEvent = null; @@ -264,14 +253,15 @@ public class WorkflowExecuteRunnable implements Callable { try { stateEvent = this.stateEvents.peek(); LoggerUtils.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(), - stateEvent.getTaskInstanceId()); + stateEvent.getTaskInstanceId()); // if state handle success then will remove this state, otherwise will retry this state next time. // The state should always handle success except database error. checkProcessInstance(stateEvent); StateEventHandler stateEventHandler = - StateEventHandlerManager.getStateEventHandler(stateEvent.getType()) - .orElseThrow(() -> new StateEventHandleError("Cannot find handler for the given state event")); + StateEventHandlerManager.getStateEventHandler(stateEvent.getType()) + .orElseThrow(() -> new StateEventHandleError( + "Cannot find handler for the given state event")); logger.info("Begin to handle state event, {}", stateEvent); if (stateEventHandler.handleStateEvent(this, stateEvent)) { this.stateEvents.remove(stateEvent); @@ -282,14 +272,15 @@ public class WorkflowExecuteRunnable implements Callable { ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS); } catch (StateEventHandleException stateEventHandleException) { logger.error("State event handle error, will retry this event: {}", - stateEvent, - stateEventHandleException); + stateEvent, + stateEventHandleException); ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS); } catch (Exception e) { - // we catch the exception here, since if the state event handle failed, the state event will still keep in the stateEvents queue. + // we catch the exception here, since if the state event handle failed, the state event will still keep + // in the stateEvents queue. logger.error("State event handle error, get a unknown exception, will retry this event: {}", - stateEvent, - e); + stateEvent, + e); ThreadUtils.sleep(Constants.SLEEP_TIME_MILLIS); } finally { LoggerUtils.removeWorkflowAndTaskInstanceIdMDC(); @@ -304,9 +295,9 @@ public class WorkflowExecuteRunnable implements Callable { } key = String.format("%d_%d_%d", - this.processDefinition.getCode(), - this.processDefinition.getVersion(), - this.processInstance.getId()); + this.processDefinition.getCode(), + this.processDefinition.getVersion(), + this.processInstance.getId()); return key; } @@ -334,7 +325,7 @@ public class WorkflowExecuteRunnable implements Callable { ITaskProcessor taskProcessor = activeTaskProcessorMaps.get(taskInstance.getTaskCode()); taskProcessor.action(TaskAction.DISPATCH); this.processService.updateTaskGroupQueueStatus(taskGroupQueue.getTaskId(), - TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()); + TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()); return true; } if (taskGroupQueue.getInQueue() == Flag.YES.getCode()) { @@ -368,7 +359,7 @@ public class WorkflowExecuteRunnable implements Callable { stateWheelExecuteThread.removeTask4RetryCheck(processInstance, taskInstance); stateWheelExecuteThread.removeTask4StateCheck(processInstance, taskInstance); - if (taskInstance.getState().typeIsSuccess()) { + if (taskInstance.getState().isSuccess()) { completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); // todo: merge the last taskInstance processInstance.setVarPool(taskInstance.getVarPool()); @@ -376,16 +367,16 @@ public class WorkflowExecuteRunnable implements Callable { if (!processInstance.isBlocked()) { submitPostNode(Long.toString(taskInstance.getTaskCode())); } - } else if (taskInstance.taskCanRetry() && processInstance.getState() != ExecutionStatus.READY_STOP) { + } else if (taskInstance.taskCanRetry() && processInstance.getState().isReadyStop()) { // retry task logger.info("Retry taskInstance taskInstance state: {}", taskInstance.getState()); retryTaskInstance(taskInstance); - } else if (taskInstance.getState().typeIsFailure()) { + } else if (taskInstance.getState().isFailure()) { completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); // There are child nodes and the failure policy is: CONTINUE if (processInstance.getFailureStrategy() == FailureStrategy.CONTINUE && DagHelper.haveAllNodeAfterNode( - Long.toString(taskInstance.getTaskCode()), - dag)) { + Long.toString(taskInstance.getTaskCode()), + dag)) { submitPostNode(Long.toString(taskInstance.getTaskCode())); } else { errorTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); @@ -393,13 +384,13 @@ public class WorkflowExecuteRunnable implements Callable { killAllTasks(); } } - } else if (taskInstance.getState().typeIsFinished()) { + } else if (taskInstance.getState().isFinished()) { // todo: when the task instance type is pause, then it should not in completeTaskMap completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); } logger.info("TaskInstance finished will try to update the workflow instance state, task code:{} state:{}", - taskInstance.getTaskCode(), - taskInstance.getState()); + taskInstance.getTaskCode(), + taskInstance.getState()); this.updateProcessInstanceState(); } catch (Exception ex) { logger.error("Task finish failed, get a exception, will remove this taskInstance from completeTaskMap", ex); @@ -420,14 +411,17 @@ public class WorkflowExecuteRunnable implements Callable { TaskInstance nextTaskInstance = this.processService.releaseTaskGroup(taskInstance); if (nextTaskInstance != null) { if (nextTaskInstance.getProcessInstanceId() == taskInstance.getProcessInstanceId()) { - StateEvent nextEvent = new StateEvent(); - nextEvent.setProcessInstanceId(this.processInstance.getId()); - nextEvent.setTaskInstanceId(nextTaskInstance.getId()); - nextEvent.setType(StateEventType.WAIT_TASK_GROUP); + TaskStateEvent nextEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(nextTaskInstance.getId()) + .type(StateEventType.WAIT_TASK_GROUP) + .build(); this.stateEvents.add(nextEvent); } else { - ProcessInstance processInstance = this.processService.findProcessInstanceById(nextTaskInstance.getProcessInstanceId()); - this.processService.sendStartTask2Master(processInstance, nextTaskInstance.getId(), org.apache.dolphinscheduler.remote.command.CommandType.TASK_WAKEUP_EVENT_REQUEST); + ProcessInstance processInstance = + this.processService.findProcessInstanceById(nextTaskInstance.getProcessInstanceId()); + this.processService.sendStartTask2Master(processInstance, nextTaskInstance.getId(), + org.apache.dolphinscheduler.remote.command.CommandType.TASK_WAKEUP_EVENT_REQUEST); } } } @@ -445,14 +439,17 @@ public class WorkflowExecuteRunnable implements Callable { TaskInstance newTaskInstance = cloneRetryTaskInstance(taskInstance); if (newTaskInstance == null) { logger.error("retry fail, new taskInstance is null, task code:{}, task id:{}", - taskInstance.getTaskCode(), - taskInstance.getId()); + taskInstance.getTaskCode(), + taskInstance.getId()); return; } waitToRetryTaskInstanceMap.put(newTaskInstance.getTaskCode(), newTaskInstance); if (!taskInstance.retryTaskIntervalOverTime()) { - logger.info("failure task will be submitted: process id: {}, task instance code: {} state:{} retry times:{} / {}, interval:{}", processInstance.getId(), newTaskInstance.getTaskCode(), - newTaskInstance.getState(), newTaskInstance.getRetryTimes(), newTaskInstance.getMaxRetryTimes(), newTaskInstance.getRetryInterval()); + logger.info( + "failure task will be submitted: process id: {}, task instance code: {} state:{} retry times:{} / {}, interval:{}", + processInstance.getId(), newTaskInstance.getTaskCode(), + newTaskInstance.getState(), newTaskInstance.getRetryTimes(), newTaskInstance.getMaxRetryTimes(), + newTaskInstance.getRetryInterval()); stateWheelExecuteThread.addTask4TimeoutCheck(processInstance, newTaskInstance); stateWheelExecuteThread.addTask4RetryCheck(processInstance, newTaskInstance); } else { @@ -472,7 +469,7 @@ public class WorkflowExecuteRunnable implements Callable { BeanUtils.copyProperties(newProcessInstance, processInstance); processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + processInstance.getProcessDefinitionVersion()); processInstance.setProcessDefinition(processDefinition); } @@ -507,7 +504,7 @@ public class WorkflowExecuteRunnable implements Callable { /** * check if task instance exist by state event */ - public void checkTaskInstanceByStateEvent(StateEvent stateEvent) throws StateEventHandleError { + public void checkTaskInstanceByStateEvent(TaskStateEvent stateEvent) throws StateEventHandleError { if (stateEvent.getTaskInstanceId() == 0) { throw new StateEventHandleError("The taskInstanceId is 0"); } @@ -577,29 +574,30 @@ public class WorkflowExecuteRunnable implements Callable { // when the serial complement is executed, the next complement instance is created, // and this method does not need to be executed when the parallel complement is used. - if (processInstance.getState() == ExecutionStatus.READY_STOP || !processInstance.getState().typeIsFinished()) { + if (processInstance.getState().isReadyStop() || !processInstance.getState().isFinished()) { return false; } Date scheduleDate = processInstance.getScheduleTime(); if (scheduleDate == null) { scheduleDate = complementListDate.get(0); - } else if (processInstance.getState().typeIsFinished()) { + } else if (processInstance.getState().isFinished()) { endProcess(); if (complementListDate.isEmpty()) { logger.info("process complement end. process id:{}", processInstance.getId()); return true; } int index = complementListDate.indexOf(scheduleDate); - if (index >= complementListDate.size() - 1 || !processInstance.getState().typeIsSuccess()) { + if (index >= complementListDate.size() - 1 || !processInstance.getState().isSuccess()) { logger.info("process complement end. process id:{}", processInstance.getId()); // complement data ends || no success return true; } - logger.info("process complement continue. process id:{}, schedule time:{} complementListDate:{}", processInstance.getId(), processInstance.getScheduleTime(), complementListDate); + logger.info("process complement continue. process id:{}, schedule time:{} complementListDate:{}", + processInstance.getId(), processInstance.getScheduleTime(), complementListDate); scheduleDate = complementListDate.get(index + 1); } - //the next process complement + // the next process complement int create = this.createComplementDataCommand(scheduleDate); if (create > 0) { logger.info("create complement data command successfully."); @@ -619,12 +617,13 @@ public class WorkflowExecuteRunnable implements Callable { if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) { cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST, - cmdParam.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST) - .substring(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST).indexOf(COMMA) + 1)); + cmdParam.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST) + .substring(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST).indexOf(COMMA) + 1)); } if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) { - cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.format(scheduleDate, YYYY_MM_DD_HH_MM_SS, null)); + cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, + DateUtils.format(scheduleDate, YYYY_MM_DD_HH_MM_SS, null)); } command.setCommandParam(JSONUtils.toJsonString(cmdParam)); command.setTaskDependType(processInstance.getTaskDependType()); @@ -693,21 +692,18 @@ public class WorkflowExecuteRunnable implements Callable { public void endProcess() { this.stateEvents.clear(); if (processDefinition.getExecutionType().typeIsSerialWait() || processDefinition.getExecutionType() - .typeIsSerialPriority()) { + .typeIsSerialPriority()) { checkSerialProcess(processDefinition); } - if (processInstance.getState().typeIsWaitingThread()) { - processService.createRecoveryWaitingThreadCommand(null, processInstance); - } ProjectUser projectUser = processService.queryProjectWithUserByProcessInstanceId(processInstance.getId()); if (processAlertManager.isNeedToSendWarning(processInstance)) { processAlertManager.sendAlertProcessInstance(processInstance, getValidTaskList(), projectUser); } - if (processInstance.getState().typeIsSuccess()) { + if (processInstance.getState().isSuccess()) { processAlertManager.closeAlert(processInstance); } if (checkTaskQueue()) { - //release task group + // release task group processService.releaseAllTaskGroup(processInstance.getId()); } } @@ -716,19 +712,21 @@ public class WorkflowExecuteRunnable implements Callable { int nextInstanceId = processInstance.getNextProcessInstanceId(); if (nextInstanceId == 0) { ProcessInstance nextProcessInstance = - this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), ExecutionStatus.SERIAL_WAIT.getCode(), processInstance.getId()); + this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), + WorkflowExecutionStatus.SERIAL_WAIT.getCode(), processInstance.getId()); if (nextProcessInstance == null) { return; } ProcessInstance nextReadyStopProcessInstance = - this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), ExecutionStatus.READY_STOP.getCode(), processInstance.getId()); + this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), + WorkflowExecutionStatus.READY_STOP.getCode(), processInstance.getId()); if (processDefinition.getExecutionType().typeIsSerialPriority() && nextReadyStopProcessInstance != null) { return; } nextInstanceId = nextProcessInstance.getId(); } ProcessInstance nextProcessInstance = this.processService.findProcessInstanceById(nextInstanceId); - if (nextProcessInstance.getState().typeIsFinished() || nextProcessInstance.getState().typeIsRunning()) { + if (nextProcessInstance.getState().isFinished() || nextProcessInstance.getState().isRunning()) { return; } Map cmdParam = new HashMap<>(); @@ -748,13 +746,16 @@ public class WorkflowExecuteRunnable implements Callable { * @throws Exception exception */ private void buildFlowDag() throws Exception { - processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); + processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); processInstance.setProcessDefinition(processDefinition); List recoverNodeList = getRecoverTaskInstanceList(processInstance.getCommandParam()); - List processTaskRelations = processService.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); - List taskDefinitionLogs = processService.getTaskDefineLogListByRelation(processTaskRelations); + List processTaskRelations = + processService.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); + List taskDefinitionLogs = + processService.getTaskDefineLogListByRelation(processTaskRelations); List taskNodeList = processService.transformTask(processTaskRelations, taskDefinitionLogs); forbiddenTaskMap.clear(); @@ -767,7 +768,8 @@ public class WorkflowExecuteRunnable implements Callable { // generate process to get DAG info List recoveryNodeCodeList = getRecoveryNodeCodeList(recoverNodeList); List startNodeNameList = parseStartNodeName(processInstance.getCommandParam()); - ProcessDag processDag = generateFlowDag(taskNodeList, startNodeNameList, recoveryNodeCodeList, processInstance.getTaskDependType()); + ProcessDag processDag = generateFlowDag(taskNodeList, startNodeNameList, recoveryNodeCodeList, + processInstance.getTaskDependType()); if (processDag == null) { logger.error("processDag is null"); return; @@ -790,27 +792,27 @@ public class WorkflowExecuteRunnable implements Callable { if (!isNewProcessInstance()) { logger.info("The workflowInstance is not a newly running instance, runtimes: {}, recover flag: {}", - processInstance.getRunTimes(), - processInstance.getRecovery()); + processInstance.getRunTimes(), + processInstance.getRecovery()); List validTaskInstanceList = - processService.findValidTaskListByProcessId(processInstance.getId()); + processService.findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance task : validTaskInstanceList) { try { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(task.getProcessInstanceId(), task.getId()); logger.info( - "Check the taskInstance from a exist workflowInstance, existTaskInstanceCode: {}, taskInstanceStatus: {}", - task.getTaskCode(), - task.getState()); + "Check the taskInstance from a exist workflowInstance, existTaskInstanceCode: {}, taskInstanceStatus: {}", + task.getTaskCode(), + task.getState()); if (validTaskMap.containsKey(task.getTaskCode())) { int oldTaskInstanceId = validTaskMap.get(task.getTaskCode()); TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId); - if (!oldTaskInstance.getState().typeIsFinished() && task.getState().typeIsFinished()) { + if (!oldTaskInstance.getState().isFinished() && task.getState().isFinished()) { task.setFlag(Flag.NO); processService.updateTaskInstance(task); continue; } logger.warn("have same taskCode taskInstance when init task queue, taskCode:{}", - task.getTaskCode()); + task.getTaskCode()); } validTaskMap.put(task.getTaskCode(), task.getId()); @@ -821,11 +823,11 @@ public class WorkflowExecuteRunnable implements Callable { continue; } if (task.isConditionsTask() || DagHelper.haveConditionsAfterNode(Long.toString(task.getTaskCode()), - dag)) { + dag)) { continue; } if (task.taskCanRetry()) { - if (task.getState() == ExecutionStatus.NEED_FAULT_TOLERANCE) { + if (task.getState().isNeedFaultTolerance()) { // tolerantTaskInstance add to standby list directly TaskInstance tolerantTaskInstance = cloneTolerantTaskInstance(task); addTaskToStandByList(tolerantTaskInstance); @@ -834,7 +836,7 @@ public class WorkflowExecuteRunnable implements Callable { } continue; } - if (task.getState().typeIsFailure()) { + if (task.getState().isFailure()) { errorTaskMap.put(task.getTaskCode(), task.getId()); } } finally { @@ -853,28 +855,31 @@ public class WorkflowExecuteRunnable implements Callable { Date start = null; Date end = null; - if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE) && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_END_DATE)) { + if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE) + && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_END_DATE)) { start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); } - List schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode()); if (complementListDate.isEmpty() && needComplementProcess()) { if (start != null && end != null) { + List schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode( + processInstance.getProcessDefinitionCode()); complementListDate = CronUtils.getSelfFireDateList(start, end, schedules); } if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) { complementListDate = CronUtils.getSelfScheduleDateList(cmdParam); } - logger.info(" process definition code:{} complement data: {}", processInstance.getProcessDefinitionCode(), complementListDate); + logger.info(" process definition code:{} complement data: {}", + processInstance.getProcessDefinitionCode(), complementListDate); if (!complementListDate.isEmpty() && Flag.NO == processInstance.getIsSubProcess()) { processInstance.setScheduleTime(complementListDate.get(0)); String globalParams = curingParamsService.curingGlobalParams(processInstance.getId(), - processDefinition.getGlobalParamMap(), - processDefinition.getGlobalParamList(), - CommandType.COMPLEMENT_DATA, - processInstance.getScheduleTime(), - cmdParam.get(Constants.SCHEDULE_TIMEZONE)); + processDefinition.getGlobalParamMap(), + processDefinition.getGlobalParamList(), + CommandType.COMPLEMENT_DATA, + processInstance.getScheduleTime(), + cmdParam.get(Constants.SCHEDULE_TIMEZONE)); processInstance.setGlobalParams(globalParams); processService.updateProcessInstance(processInstance); } @@ -882,9 +887,9 @@ public class WorkflowExecuteRunnable implements Callable { } } logger.info("Initialize task queue, dependFailedTaskMap: {}, completeTaskMap: {}, errorTaskMap: {}", - dependFailedTaskMap, - completeTaskMap, - errorTaskMap); + dependFailedTaskMap, + completeTaskMap, + errorTaskMap); } /** @@ -901,17 +906,18 @@ public class WorkflowExecuteRunnable implements Callable { ITaskProcessor taskProcessor = TaskProcessorFactory.getTaskProcessor(taskInstance.getTaskType()); taskProcessor.init(taskInstance, processInstance); - if (taskInstance.getState() == ExecutionStatus.RUNNING_EXECUTION && taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) { + if (taskInstance.getState().isRunning() + && taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) { notifyProcessHostUpdate(taskInstance); } boolean submit = taskProcessor.action(TaskAction.SUBMIT); if (!submit) { logger.error("process id:{} name:{} submit standby task id:{} name:{} failed!", - processInstance.getId(), - processInstance.getName(), - taskInstance.getId(), - taskInstance.getName()); + processInstance.getId(), + processInstance.getName(), + taskInstance.getId(), + taskInstance.getName()); return Optional.empty(); } @@ -937,12 +943,13 @@ public class WorkflowExecuteRunnable implements Callable { int taskGroupId = taskInstance.getTaskGroupId(); if (taskGroupId > 0) { boolean acquireTaskGroup = processService.acquireTaskGroup(taskInstance.getId(), - taskInstance.getName(), - taskGroupId, - taskInstance.getProcessInstanceId(), - taskInstance.getTaskGroupPriority()); + taskInstance.getName(), + taskGroupId, + taskInstance.getProcessInstanceId(), + taskInstance.getTaskGroupPriority()); if (!acquireTaskGroup) { - logger.info("submit task name :{}, but the first time to try to acquire task group failed", taskInstance.getName()); + logger.info("submit task name :{}, but the first time to try to acquire task group failed", + taskInstance.getName()); return Optional.of(taskInstance); } } @@ -950,10 +957,10 @@ public class WorkflowExecuteRunnable implements Callable { boolean dispatchSuccess = taskProcessor.action(TaskAction.DISPATCH); if (!dispatchSuccess) { logger.error("process id:{} name:{} dispatch standby task id:{} name:{} failed!", - processInstance.getId(), - processInstance.getName(), - taskInstance.getId(), - taskInstance.getName()); + processInstance.getId(), + processInstance.getName(), + taskInstance.getId(), + taskInstance.getName()); return Optional.empty(); } taskProcessor.action(TaskAction.RUN); @@ -961,28 +968,30 @@ public class WorkflowExecuteRunnable implements Callable { stateWheelExecuteThread.addTask4TimeoutCheck(processInstance, taskInstance); stateWheelExecuteThread.addTask4StateCheck(processInstance, taskInstance); - if (taskProcessor.taskInstance().getState().typeIsFinished()) { + if (taskProcessor.taskInstance().getState().isFinished()) { if (processInstance.isBlocked()) { - StateEvent processBlockEvent = new StateEvent(); - processBlockEvent.setProcessInstanceId(this.processInstance.getId()); - processBlockEvent.setTaskInstanceId(taskInstance.getId()); - processBlockEvent.setExecutionStatus(taskProcessor.taskInstance().getState()); - processBlockEvent.setType(StateEventType.PROCESS_BLOCKED); + TaskStateEvent processBlockEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(taskInstance.getId()) + .status(taskProcessor.taskInstance().getState()) + .type(StateEventType.PROCESS_BLOCKED) + .build(); this.stateEvents.add(processBlockEvent); } - StateEvent taskStateChangeEvent = new StateEvent(); - taskStateChangeEvent.setProcessInstanceId(this.processInstance.getId()); - taskStateChangeEvent.setTaskInstanceId(taskInstance.getId()); - taskStateChangeEvent.setExecutionStatus(taskProcessor.taskInstance().getState()); - taskStateChangeEvent.setType(StateEventType.TASK_STATE_CHANGE); + TaskStateEvent taskStateChangeEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(taskInstance.getId()) + .status(taskProcessor.taskInstance().getState()) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); this.stateEvents.add(taskStateChangeEvent); } return Optional.of(taskInstance); } catch (Exception e) { logger.error("submit standby task error, taskCode: {}, taskInstanceId: {}", - taskInstance.getTaskCode(), - taskInstance.getId(), - e); + taskInstance.getTaskCode(), + taskInstance.getId(), + e); return Optional.empty(); } } @@ -1094,7 +1103,7 @@ public class WorkflowExecuteRunnable implements Callable { // task name taskInstance.setName(taskNode.getName()); // task instance state - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); // process instance id taskInstance.setProcessInstanceId(processInstance.getId()); // task instance type @@ -1120,14 +1129,14 @@ public class WorkflowExecuteRunnable implements Callable { // retry task instance interval taskInstance.setRetryInterval(taskNode.getRetryInterval()); - //set task param + // set task param taskInstance.setTaskParams(taskNode.getTaskParams()); - //set task group and priority + // set task group and priority taskInstance.setTaskGroupId(taskNode.getTaskGroupId()); taskInstance.setTaskGroupPriority(taskNode.getTaskGroupPriority()); - //set task cpu quota and max memory + // set task cpu quota and max memory taskInstance.setCpuQuota(taskNode.getCpuQuota()); taskInstance.setMemoryMax(taskNode.getMemoryMax()); @@ -1140,10 +1149,13 @@ public class WorkflowExecuteRunnable implements Callable { String processWorkerGroup = processInstance.getWorkerGroup(); processWorkerGroup = StringUtils.isBlank(processWorkerGroup) ? DEFAULT_WORKER_GROUP : processWorkerGroup; - String taskWorkerGroup = StringUtils.isBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup(); + String taskWorkerGroup = + StringUtils.isBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup(); - Long processEnvironmentCode = Objects.isNull(processInstance.getEnvironmentCode()) ? -1 : processInstance.getEnvironmentCode(); - Long taskEnvironmentCode = Objects.isNull(taskNode.getEnvironmentCode()) ? processEnvironmentCode : taskNode.getEnvironmentCode(); + Long processEnvironmentCode = + Objects.isNull(processInstance.getEnvironmentCode()) ? -1 : processInstance.getEnvironmentCode(); + Long taskEnvironmentCode = + Objects.isNull(taskNode.getEnvironmentCode()) ? processEnvironmentCode : taskNode.getEnvironmentCode(); if (!processWorkerGroup.equals(DEFAULT_WORKER_GROUP) && taskWorkerGroup.equals(DEFAULT_WORKER_GROUP)) { taskInstance.setWorkerGroup(processWorkerGroup); @@ -1199,19 +1211,20 @@ public class WorkflowExecuteRunnable implements Callable { return taskInstanceMap.values(); } - private void setVarPoolValue(Map allProperty, Map allTaskInstance, TaskInstance preTaskInstance, Property thisProperty) { - //for this taskInstance all the param in this part is IN. + private void setVarPoolValue(Map allProperty, Map allTaskInstance, + TaskInstance preTaskInstance, Property thisProperty) { + // for this taskInstance all the param in this part is IN. thisProperty.setDirect(Direct.IN); - //get the pre taskInstance Property's name + // get the pre taskInstance Property's name String proName = thisProperty.getProp(); - //if the Previous nodes have the Property of same name + // if the Previous nodes have the Property of same name if (allProperty.containsKey(proName)) { - //comparison the value of two Property + // comparison the value of two Property Property otherPro = allProperty.get(proName); - //if this property'value of loop is empty,use the other,whether the other's value is empty or not + // if this property'value of loop is empty,use the other,whether the other's value is empty or not if (StringUtils.isEmpty(thisProperty.getValue())) { allProperty.put(proName, otherPro); - //if property'value of loop is not empty,and the other's value is not empty too, use the earlier value + // if property'value of loop is not empty,and the other's value is not empty too, use the earlier value } else if (StringUtils.isNotEmpty(otherPro.getValue())) { TaskInstance otherTask = allTaskInstance.get(proName); if (otherTask.getEndTime().getTime() > preTaskInstance.getEndTime().getTime()) { @@ -1241,8 +1254,8 @@ public class WorkflowExecuteRunnable implements Callable { TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); if (taskInstance == null) { logger.warn("Cannot find the taskInstance from taskInstanceMap, taskInstanceId: {}, taskConde: {}", - taskInstanceId, - taskConde); + taskInstanceId, + taskConde); // This case will happen when we submit to db failed, then the taskInstanceId is 0 continue; } @@ -1265,7 +1278,7 @@ public class WorkflowExecuteRunnable implements Callable { private void submitPostNode(String parentNodeCode) throws StateEventHandleException { Set submitTaskNodeList = - DagHelper.parsePostNodes(parentNodeCode, skipTaskNodeMap, dag, getCompleteTaskInstanceMap()); + DagHelper.parsePostNodes(parentNodeCode, skipTaskNodeMap, dag, getCompleteTaskInstanceMap()); List taskInstances = new ArrayList<>(); for (String taskNode : submitTaskNodeList) { TaskNode taskNodeObject = dag.getNode(taskNode); @@ -1277,7 +1290,7 @@ public class WorkflowExecuteRunnable implements Callable { TaskInstance task = createTaskInstance(processInstance, taskNodeObject); taskInstances.add(task); } - //the end node of the branch of the dag + // the end node of the branch of the dag if (StringUtils.isNotEmpty(parentNodeCode) && dag.getEndNode().contains(parentNodeCode)) { TaskInstance endTaskInstance = taskInstanceMap.get(completeTaskMap.get(NumberUtils.toLong(parentNodeCode))); String taskInstanceVarPool = endTaskInstance.getVarPool(); @@ -1306,7 +1319,7 @@ public class WorkflowExecuteRunnable implements Callable { logger.info("task {} has already run success", task.getName()); continue; } - if (task.getState().typeIsPause() || task.getState().typeIsCancel()) { + if (task.getState().isKill()) { logger.info("task {} stopped, the state is {}", task.getName(), task.getState()); continue; } @@ -1340,8 +1353,8 @@ public class WorkflowExecuteRunnable implements Callable { return DependResult.WAITING; } Integer depsTaskId = completeTaskMap.get(despNodeTaskCode); - ExecutionStatus depTaskState = taskInstanceMap.get(depsTaskId).getState(); - if (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) { + TaskExecutionStatus depTaskState = taskInstanceMap.get(depsTaskId).getState(); + if (depTaskState.isKill()) { return DependResult.NON_EXEC; } // ignore task state if current task is block @@ -1359,7 +1372,8 @@ public class WorkflowExecuteRunnable implements Callable { } } } - logger.info("taskCode: {} completeDependTaskList: {}", taskCode, Arrays.toString(completeTaskMap.keySet().toArray())); + logger.info("taskCode: {} completeDependTaskList: {}", taskCode, + Arrays.toString(completeTaskMap.keySet().toArray())); return DependResult.SUCCESS; } @@ -1387,16 +1401,17 @@ public class WorkflowExecuteRunnable implements Callable { */ private boolean dependTaskSuccess(String dependNodeName, String nextNodeName) { if (dag.getNode(dependNodeName).isConditionsTask()) { - //condition task need check the branch to run - List nextTaskList = DagHelper.parseConditionTask(dependNodeName, skipTaskNodeMap, dag, getCompleteTaskInstanceMap()); + // condition task need check the branch to run + List nextTaskList = + DagHelper.parseConditionTask(dependNodeName, skipTaskNodeMap, dag, getCompleteTaskInstanceMap()); if (!nextTaskList.contains(nextNodeName)) { return false; } } else { long taskCode = Long.parseLong(dependNodeName); Integer taskInstanceId = completeTaskMap.get(taskCode); - ExecutionStatus depTaskState = taskInstanceMap.get(taskInstanceId).getState(); - if (depTaskState.typeIsFailure()) { + TaskExecutionStatus depTaskState = taskInstanceMap.get(taskInstanceId).getState(); + if (depTaskState.isFailure()) { return false; } } @@ -1409,7 +1424,7 @@ public class WorkflowExecuteRunnable implements Callable { * @param state state * @return task instance list */ - private List getCompleteTaskByState(ExecutionStatus state) { + private List getCompleteTaskByState(TaskExecutionStatus state) { List resultList = new ArrayList<>(); for (Integer taskInstanceId : completeTaskMap.values()) { TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); @@ -1426,13 +1441,14 @@ public class WorkflowExecuteRunnable implements Callable { * @param state state * @return ExecutionStatus */ - private ExecutionStatus runningState(ExecutionStatus state) { - if (state == ExecutionStatus.READY_STOP || state == ExecutionStatus.READY_PAUSE || state == ExecutionStatus.WAITING_THREAD || state == ExecutionStatus.READY_BLOCK || - state == ExecutionStatus.DELAY_EXECUTION) { + private WorkflowExecutionStatus runningState(WorkflowExecutionStatus state) { + if (state == WorkflowExecutionStatus.READY_STOP || state == WorkflowExecutionStatus.READY_PAUSE + || state == WorkflowExecutionStatus.READY_BLOCK || + state == WorkflowExecutionStatus.DELAY_EXECUTION) { // if the running task is not completed, the state remains unchanged return state; } else { - return ExecutionStatus.RUNNING_EXECUTION; + return WorkflowExecutionStatus.RUNNING_EXECUTION; } } @@ -1464,22 +1480,13 @@ public class WorkflowExecuteRunnable implements Callable { return true; } if (processInstance.getFailureStrategy() == FailureStrategy.CONTINUE) { - return readyToSubmitTaskQueue.size() == 0 && activeTaskProcessorMaps.size() == 0 && waitToRetryTaskInstanceMap.size() == 0; + return readyToSubmitTaskQueue.size() == 0 && activeTaskProcessorMaps.size() == 0 + && waitToRetryTaskInstanceMap.size() == 0; } } return false; } - /** - * whether task for waiting thread - * - * @return Boolean whether has waiting thread task - */ - private boolean hasWaitingThreadTask() { - List waitingList = getCompleteTaskByState(ExecutionStatus.WAITING_THREAD); - return CollectionUtils.isNotEmpty(waitingList); - } - /** * prepare for pause * 1，failed retry task in the preparation queue , returns to failure directly @@ -1488,16 +1495,15 @@ public class WorkflowExecuteRunnable implements Callable { * * @return ExecutionStatus */ - private ExecutionStatus processReadyPause() { + private WorkflowExecutionStatus processReadyPause() { if (hasRetryTaskInStandBy()) { - return ExecutionStatus.FAILURE; + return WorkflowExecutionStatus.FAILURE; } - List pauseList = getCompleteTaskByState(ExecutionStatus.PAUSE); - if (CollectionUtils.isNotEmpty(pauseList) || processInstance.isBlocked() || !isComplementEnd() || readyToSubmitTaskQueue.size() > 0) { - return ExecutionStatus.PAUSE; + if (processInstance.isBlocked() || !isComplementEnd() || readyToSubmitTaskQueue.size() > 0) { + return WorkflowExecutionStatus.PAUSE; } else { - return ExecutionStatus.SUCCESS; + return WorkflowExecutionStatus.SUCCESS; } } @@ -1509,7 +1515,7 @@ public class WorkflowExecuteRunnable implements Callable { * * @return ExecutionStatus */ - private ExecutionStatus processReadyBlock() { + private WorkflowExecutionStatus processReadyBlock() { if (activeTaskProcessorMaps.size() > 0) { for (ITaskProcessor taskProcessor : activeTaskProcessorMaps.values()) { if (!TASK_TYPE_BLOCKING.equals(taskProcessor.getType())) { @@ -1518,11 +1524,11 @@ public class WorkflowExecuteRunnable implements Callable { } } if (readyToSubmitTaskQueue.size() > 0) { - for (Iterator iter = readyToSubmitTaskQueue.iterator(); iter.hasNext(); ) { - iter.next().setState(ExecutionStatus.KILL); + for (Iterator iter = readyToSubmitTaskQueue.iterator(); iter.hasNext();) { + iter.next().setState(TaskExecutionStatus.KILL); } } - return ExecutionStatus.BLOCK; + return WorkflowExecutionStatus.BLOCK; } /** @@ -1530,47 +1536,39 @@ public class WorkflowExecuteRunnable implements Callable { * * @return process instance execution status */ - private ExecutionStatus getProcessInstanceState(ProcessInstance instance) { - ExecutionStatus state = instance.getState(); + private WorkflowExecutionStatus getProcessInstanceState(ProcessInstance instance) { + WorkflowExecutionStatus state = instance.getState(); if (activeTaskProcessorMaps.size() > 0 || hasRetryTaskInStandBy()) { // active task and retry task exists - ExecutionStatus executionStatus = runningState(state); + WorkflowExecutionStatus executionStatus = runningState(state); logger.info("The workflowInstance has task running, the workflowInstance status is {}", executionStatus); return executionStatus; } // block - if (state == ExecutionStatus.READY_BLOCK) { - ExecutionStatus executionStatus = processReadyBlock(); + if (state == WorkflowExecutionStatus.READY_BLOCK) { + WorkflowExecutionStatus executionStatus = processReadyBlock(); logger.info("The workflowInstance is ready to block, the workflowInstance status is {}", executionStatus); return executionStatus; } - // waiting thread - if (hasWaitingThreadTask()) { - logger.info("The workflowInstance has waiting thread task, the workflow status is {}", - ExecutionStatus.WAITING_THREAD); - return ExecutionStatus.WAITING_THREAD; - } - // pause - if (state == ExecutionStatus.READY_PAUSE) { - ExecutionStatus executionStatus = processReadyPause(); + if (state == WorkflowExecutionStatus.READY_PAUSE) { + WorkflowExecutionStatus executionStatus = processReadyPause(); logger.info("The workflowInstance is ready to pause, the workflow status is {}", executionStatus); return executionStatus; } // stop - if (state == ExecutionStatus.READY_STOP) { - List stopList = getCompleteTaskByState(ExecutionStatus.STOP); - List killList = getCompleteTaskByState(ExecutionStatus.KILL); - List failList = getCompleteTaskByState(ExecutionStatus.FAILURE); - ExecutionStatus executionStatus; - if (CollectionUtils.isNotEmpty(stopList) || CollectionUtils.isNotEmpty(killList) || CollectionUtils.isNotEmpty(failList) || !isComplementEnd()) { - executionStatus = ExecutionStatus.STOP; + if (state == WorkflowExecutionStatus.READY_STOP) { + List killList = getCompleteTaskByState(TaskExecutionStatus.KILL); + List failList = getCompleteTaskByState(TaskExecutionStatus.FAILURE); + WorkflowExecutionStatus executionStatus; + if (CollectionUtils.isNotEmpty(killList) || CollectionUtils.isNotEmpty(failList) || !isComplementEnd()) { + executionStatus = WorkflowExecutionStatus.STOP; } else { - executionStatus = ExecutionStatus.SUCCESS; + executionStatus = WorkflowExecutionStatus.SUCCESS; } logger.info("The workflowInstance is ready to stop, the workflow status is {}", executionStatus); return executionStatus; @@ -1578,22 +1576,22 @@ public class WorkflowExecuteRunnable implements Callable { // process failure if (processFailed()) { - logger.info("The workflowInstance is failed, the workflow status is {}", ExecutionStatus.FAILURE); - return ExecutionStatus.FAILURE; + logger.info("The workflowInstance is failed, the workflow status is {}", WorkflowExecutionStatus.FAILURE); + return WorkflowExecutionStatus.FAILURE; } // success - if (state == ExecutionStatus.RUNNING_EXECUTION) { - List killTasks = getCompleteTaskByState(ExecutionStatus.KILL); + if (state == WorkflowExecutionStatus.RUNNING_EXECUTION) { + List killTasks = getCompleteTaskByState(TaskExecutionStatus.KILL); if (readyToSubmitTaskQueue.size() > 0 || waitToRetryTaskInstanceMap.size() > 0) { - //tasks currently pending submission, no retries, indicating that depend is waiting to complete - return ExecutionStatus.RUNNING_EXECUTION; + // tasks currently pending submission, no retries, indicating that depend is waiting to complete + return WorkflowExecutionStatus.RUNNING_EXECUTION; } else if (CollectionUtils.isNotEmpty(killTasks)) { // tasks maybe killed manually - return ExecutionStatus.FAILURE; + return WorkflowExecutionStatus.FAILURE; } else { - // if the waiting queue is empty and the status is in progress, then success - return ExecutionStatus.SUCCESS; + // if the waiting queue is empty and the status is in progress, then success + return WorkflowExecutionStatus.SUCCESS; } } @@ -1620,43 +1618,44 @@ public class WorkflowExecuteRunnable implements Callable { * after each batch of tasks is executed, the status of the process instance is updated */ private void updateProcessInstanceState() throws StateEventHandleException { - ExecutionStatus state = getProcessInstanceState(processInstance); + WorkflowExecutionStatus state = getProcessInstanceState(processInstance); if (processInstance.getState() != state) { logger.info("Update workflowInstance states, origin state: {}, target state: {}", - processInstance.getState(), - state); + processInstance.getState(), + state); updateWorkflowInstanceStatesToDB(state); - StateEvent stateEvent = new StateEvent(); - stateEvent.setExecutionStatus(processInstance.getState()); - stateEvent.setProcessInstanceId(this.processInstance.getId()); - stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE); + WorkflowStateEvent stateEvent = WorkflowStateEvent.builder() + .processInstanceId(processInstance.getId()) + .status(processInstance.getState()) + .type(StateEventType.PROCESS_STATE_CHANGE) + .build(); // replace with `stateEvents`, make sure `WorkflowExecuteThread` can be deleted to avoid memory leaks this.stateEvents.add(stateEvent); } else { logger.info("There is no need to update the workflow instance state, origin state: {}, target state: {}", - processInstance.getState(), - state); + processInstance.getState(), + state); } } /** * stateEvent's execution status as process instance state */ - public void updateProcessInstanceState(StateEvent stateEvent) throws StateEventHandleException { - ExecutionStatus state = stateEvent.getExecutionStatus(); + public void updateProcessInstanceState(WorkflowStateEvent stateEvent) throws StateEventHandleException { + WorkflowExecutionStatus state = stateEvent.getStatus(); updateWorkflowInstanceStatesToDB(state); } - private void updateWorkflowInstanceStatesToDB(ExecutionStatus newStates) throws StateEventHandleException { - ExecutionStatus originStates = processInstance.getState(); + private void updateWorkflowInstanceStatesToDB(WorkflowExecutionStatus newStates) throws StateEventHandleException { + WorkflowExecutionStatus originStates = processInstance.getState(); if (originStates != newStates) { logger.info("Begin to update workflow instance state , state will change from {} to {}", - originStates, - newStates); + originStates, + newStates); processInstance.setState(newStates); - if (newStates.typeIsFinished()) { + if (newStates.isFinished()) { processInstance.setEndTime(new Date()); } try { @@ -1691,9 +1690,9 @@ public class WorkflowExecuteRunnable implements Callable { return; } logger.info("add task to stand by list, task name:{}, task id:{}, task code:{}", - taskInstance.getName(), - taskInstance.getId(), - taskInstance.getTaskCode()); + taskInstance.getName(), + taskInstance.getId(), + taskInstance.getTaskCode()); TaskMetrics.incTaskInstanceByState("submit"); readyToSubmitTaskQueue.put(taskInstance); } @@ -1713,8 +1712,8 @@ public class WorkflowExecuteRunnable implements Callable { * @return Boolean whether has retry task in standby */ private boolean hasRetryTaskInStandBy() { - for (Iterator iter = readyToSubmitTaskQueue.iterator(); iter.hasNext(); ) { - if (iter.next().getState().typeIsFailure()) { + for (Iterator iter = readyToSubmitTaskQueue.iterator(); iter.hasNext();) { + if (iter.next().getState().isFailure()) { return true; } } @@ -1726,8 +1725,8 @@ public class WorkflowExecuteRunnable implements Callable { */ public void killAllTasks() { logger.info("kill called on process instance id: {}, num: {}", - processInstance.getId(), - activeTaskProcessorMaps.size()); + processInstance.getId(), + activeTaskProcessorMaps.size()); if (readyToSubmitTaskQueue.size() > 0) { readyToSubmitTaskQueue.clear(); @@ -1740,23 +1739,24 @@ public class WorkflowExecuteRunnable implements Callable { continue; } TaskInstance taskInstance = processService.findTaskInstanceById(taskInstanceId); - if (taskInstance == null || taskInstance.getState().typeIsFinished()) { + if (taskInstance == null || taskInstance.getState().isFinished()) { continue; } taskProcessor.action(TaskAction.STOP); - if (taskProcessor.taskInstance().getState().typeIsFinished()) { - StateEvent stateEvent = new StateEvent(); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); - stateEvent.setProcessInstanceId(this.processInstance.getId()); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setExecutionStatus(taskProcessor.taskInstance().getState()); - this.addStateEvent(stateEvent); + if (taskProcessor.taskInstance().getState().isFinished()) { + TaskStateEvent taskStateEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(taskInstance.getId()) + .status(taskProcessor.taskInstance().getState()) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); + this.addStateEvent(taskStateEvent); } } } public boolean workFlowFinish() { - return this.processInstance.getState().typeIsFinished(); + return this.processInstance.getState().isFinished(); } /** @@ -1772,9 +1772,10 @@ public class WorkflowExecuteRunnable implements Callable { // stop tasks which is retrying if forced success happens if (task.taskCanRetry()) { TaskInstance retryTask = processService.findTaskInstanceById(task.getId()); - if (retryTask != null && retryTask.getState().equals(ExecutionStatus.FORCED_SUCCESS)) { + if (retryTask != null && retryTask.getState().isForceSuccess()) { task.setState(retryTask.getState()); - logger.info("task: {} has been forced success, put it into complete task list and stop retrying", task.getName()); + logger.info("task: {} has been forced success, put it into complete task list and stop retrying", + task.getName()); removeTaskFromStandbyList(task); completeTaskMap.put(task.getTaskCode(), task.getId()); taskInstanceMap.put(task.getId(), task); @@ -1782,9 +1783,9 @@ public class WorkflowExecuteRunnable implements Callable { continue; } } - //init varPool only this task is the first time running + // init varPool only this task is the first time running if (task.isFirstRun()) { - //get pre task ,get all the task varPool to this task + // get pre task ,get all the task varPool to this task Set preTask = dag.getPreviousNodes(Long.toString(task.getTaskCode())); getPreVarPool(task, preTask); } @@ -1796,18 +1797,18 @@ public class WorkflowExecuteRunnable implements Callable { // Remove and add to complete map and error map if (!removeTaskFromStandbyList(task)) { logger.error( - "Task submit failed, remove from standby list failed, workflowInstanceId: {}, taskCode: {}", - processInstance.getId(), - task.getTaskCode()); + "Task submit failed, remove from standby list failed, workflowInstanceId: {}, taskCode: {}", + processInstance.getId(), + task.getTaskCode()); } completeTaskMap.put(task.getTaskCode(), task.getId()); taskInstanceMap.put(task.getId(), task); errorTaskMap.put(task.getTaskCode(), task.getId()); activeTaskProcessorMaps.remove(task.getTaskCode()); logger.error("Task submitted failed, workflowInstanceId: {}, taskInstanceId: {}, taskCode: {}", - task.getProcessInstanceId(), - task.getId(), - task.getTaskCode()); + task.getProcessInstanceId(), + task.getId(), + task.getTaskCode()); } else { removeTaskFromStandbyList(task); } @@ -1815,11 +1816,13 @@ public class WorkflowExecuteRunnable implements Callable { // if the dependency fails, the current node is not submitted and the state changes to failure. dependFailedTaskMap.put(task.getTaskCode(), task.getId()); removeTaskFromStandbyList(task); - logger.info("Task dependent result is failed, taskInstanceId:{} depend result : {}", task.getId(), dependResult); + logger.info("Task dependent result is failed, taskInstanceId:{} depend result : {}", task.getId(), + dependResult); } else if (DependResult.NON_EXEC == dependResult) { // for some reasons(depend task pause/stop) this task would not be submit removeTaskFromStandbyList(task); - logger.info("Remove task due to depend result not executed, taskInstanceId:{} depend result : {}", task.getId(), dependResult); + logger.info("Remove task due to depend result not executed, taskInstanceId:{} depend result : {}", + task.getId(), dependResult); } } } @@ -1836,10 +1839,10 @@ public class WorkflowExecuteRunnable implements Callable { // todo: Can we use a better way to set the recover taskInstanceId list? rather then use the cmdParam if (paramMap != null && paramMap.containsKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) { List startTaskInstanceIds = Arrays.stream(paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING) - .split(COMMA)) - .filter(StringUtils::isNotEmpty) - .map(Integer::valueOf) - .collect(Collectors.toList()); + .split(COMMA)) + .filter(StringUtils::isNotEmpty) + .map(Integer::valueOf) + .collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(startTaskInstanceIds)) { return processService.findTaskInstanceByIdList(startTaskInstanceIds); } @@ -1920,13 +1923,14 @@ public class WorkflowExecuteRunnable implements Callable { return false; } - if (ExecutionStatus.RUNNING_EXECUTION == processInstance.getState() && processInstance.getRunTimes() == 1) { + if (WorkflowExecutionStatus.RUNNING_EXECUTION == processInstance.getState() + && processInstance.getRunTimes() == 1) { return true; } logger.info( - "The workflowInstance has been executed before, this execution is to reRun, processInstance status: {}, runTimes: {}", - processInstance.getState(), - processInstance.getRunTimes()); + "The workflowInstance has been executed before, this execution is to reRun, processInstance status: {}, runTimes: {}", + processInstance.getState(), + processInstance.getRunTimes()); return false; } @@ -1969,14 +1973,14 @@ public class WorkflowExecuteRunnable implements Callable { Map globalMap = processDefinition.getGlobalParamMap(); List globalParamList = processDefinition.getGlobalParamList(); if (startParamMap.size() > 0 && globalMap != null) { - //start param to overwrite global param + // start param to overwrite global param for (Map.Entry param : globalMap.entrySet()) { String val = startParamMap.get(param.getKey()); if (val != null) { param.setValue(val); } } - //start param to create new global param if global not exist + // start param to create new global param if global not exist for (Map.Entry startParam : startParamMap.entrySet()) { if (!globalMap.containsKey(startParam.getKey())) { globalMap.put(startParam.getKey(), startParam.getValue()); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java index ce66318967..5d0e237027 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThreadPool.java @@ -17,26 +17,23 @@ package org.apache.dolphinscheduler.server.master.runner; +import com.google.common.base.Strings; +import lombok.NonNull; import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.server.master.event.StateEvent; import org.apache.dolphinscheduler.common.enums.StateEventType; import org.apache.dolphinscheduler.common.utils.LoggerUtils; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; -import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; +import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; +import org.apache.dolphinscheduler.server.master.event.StateEvent; +import org.apache.dolphinscheduler.server.master.event.TaskStateEvent; import org.apache.dolphinscheduler.service.process.ProcessService; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,9 +42,9 @@ import org.springframework.stereotype.Component; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFutureCallback; -import com.google.common.base.Strings; - -import lombok.NonNull; +import javax.annotation.PostConstruct; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * Used to execute {@link WorkflowExecuteRunnable}. @@ -89,9 +86,11 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor { * submit state event */ public void submitStateEvent(StateEvent stateEvent) { - WorkflowExecuteRunnable workflowExecuteThread = processInstanceExecCacheManager.getByProcessInstanceId(stateEvent.getProcessInstanceId()); + WorkflowExecuteRunnable workflowExecuteThread = + processInstanceExecCacheManager.getByProcessInstanceId(stateEvent.getProcessInstanceId()); if (workflowExecuteThread == null) { - logger.warn("Submit state event error, cannot from workflowExecuteThread from cache manager, stateEvent:{}", stateEvent); + logger.warn("Submit state event error, cannot from workflowExecuteThread from cache manager, stateEvent:{}", + stateEvent); return; } workflowExecuteThread.addStateEvent(stateEvent); @@ -113,6 +112,7 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor { int processInstanceId = workflowExecuteThread.getProcessInstance().getId(); ListenableFuture future = this.submitListenable(workflowExecuteThread::handleEvents); future.addCallback(new ListenableFutureCallback() { + @Override public void onFailure(Throwable ex) { LoggerUtils.setWorkflowInstanceIdMDC(processInstanceId); @@ -129,7 +129,8 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor { try { LoggerUtils.setWorkflowInstanceIdMDC(workflowExecuteThread.getProcessInstance().getId()); if (workflowExecuteThread.workFlowFinish()) { - stateWheelExecuteThread.removeProcess4TimeoutCheck(workflowExecuteThread.getProcessInstance().getId()); + stateWheelExecuteThread + .removeProcess4TimeoutCheck(workflowExecuteThread.getProcessInstance().getId()); processInstanceExecCacheManager.removeByProcessInstanceId(processInstanceId); notifyProcessChanged(workflowExecuteThread.getProcessInstance()); logger.info("Workflow instance is finished."); @@ -173,27 +174,30 @@ public class WorkflowExecuteThreadPool extends ThreadPoolTaskExecutor { logger.warn("The execute cache manager doesn't contains this workflow instance"); return; } - StateEvent stateEvent = new StateEvent(); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); - stateEvent.setProcessInstanceId(processInstance.getId()); - stateEvent.setExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(taskInstance.getId()) + .type(StateEventType.TASK_STATE_CHANGE) + .status(TaskExecutionStatus.RUNNING_EXECUTION) + .build(); this.submitStateEvent(stateEvent); } /** * notify process's master */ - private void notifyProcess(ProcessInstance finishProcessInstance, ProcessInstance processInstance, TaskInstance taskInstance) { + private void notifyProcess(ProcessInstance finishProcessInstance, ProcessInstance processInstance, + TaskInstance taskInstance) { String processInstanceHost = processInstance.getHost(); if (Strings.isNullOrEmpty(processInstanceHost)) { - logger.error("process {} host is empty, cannot notify task {} now", processInstance.getId(), taskInstance.getId()); + logger.error("process {} host is empty, cannot notify task {} now", processInstance.getId(), + taskInstance.getId()); return; } - StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand( - finishProcessInstance.getId(), 0, finishProcessInstance.getState(), processInstance.getId(), taskInstance.getId() - ); + WorkflowStateEventChangeCommand workflowStateEventChangeCommand = new WorkflowStateEventChangeCommand( + finishProcessInstance.getId(), 0, finishProcessInstance.getState(), processInstance.getId(), + taskInstance.getId()); Host host = new Host(processInstanceHost); - stateEventCallbackService.sendResult(host, stateEventChangeCommand.convert2Command()); + stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command()); } } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java index 76b8388b38..d9f82a91dc 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java @@ -55,7 +55,7 @@ import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskChannel; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.ConnectorType; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.ExecuteSqlType; import org.apache.dolphinscheduler.plugin.task.api.model.JdbcInfo; @@ -102,7 +102,8 @@ import lombok.NonNull; public abstract class BaseTaskProcessor implements ITaskProcessor { - protected final Logger logger = LoggerFactory.getLogger(String.format(TaskConstants.TASK_LOG_LOGGER_NAME_FORMAT, getClass())); + protected final Logger logger = + LoggerFactory.getLogger(String.format(TaskConstants.TASK_LOG_LOGGER_NAME_FORMAT, getClass())); protected boolean killed = false; @@ -141,7 +142,7 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { } protected javax.sql.DataSource defaultDataSource = - SpringApplicationContext.getBean(javax.sql.DataSource.class); + SpringApplicationContext.getBean(javax.sql.DataSource.class); /** * pause task, common tasks donot need this. @@ -281,7 +282,7 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { // verify tenant is null if (verifyTenantIsNull(tenant, taskInstance)) { - taskInstance.setState(ExecutionStatus.FAILURE); + taskInstance.setState(TaskExecutionStatus.FAILURE); processService.saveTaskInstance(taskInstance); return null; } @@ -298,7 +299,7 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { // TODO to be optimized DataQualityTaskExecutionContext dataQualityTaskExecutionContext = new DataQualityTaskExecutionContext(); if (TASK_TYPE_DATA_QUALITY.equalsIgnoreCase(taskInstance.getTaskType())) { - setDataQualityTaskRelation(dataQualityTaskExecutionContext,taskInstance,tenant.getTenantCode()); + setDataQualityTaskRelation(dataQualityTaskExecutionContext, taskInstance, tenant.getTenantCode()); } K8sTaskExecutionContext k8sTaskExecutionContext = new K8sTaskExecutionContext(); if (TASK_TYPE_K8S.equalsIgnoreCase(taskInstance.getTaskType())) { @@ -307,8 +308,10 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { Map businessParamsMap = curingParamsService.preBuildBusinessParams(processInstance); - AbstractParameters baseParam = taskPluginManager.getParameters(ParametersNode.builder().taskType(taskInstance.getTaskType()).taskParams(taskInstance.getTaskParams()).build()); - Map propertyMap = curingParamsService.paramParsingPreparation(taskInstance, baseParam, processInstance); + AbstractParameters baseParam = taskPluginManager.getParameters(ParametersNode.builder() + .taskType(taskInstance.getTaskType()).taskParams(taskInstance.getTaskParams()).build()); + Map propertyMap = + curingParamsService.paramParsingPreparation(taskInstance, baseParam, processInstance); return TaskExecutionContextBuilder.get() .buildTaskInstanceRelatedInfo(taskInstance) .buildTaskDefinitionRelatedInfo(taskInstance.getTaskDefine()) @@ -365,7 +368,8 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { List udfFuncList = processService.queryUdfFunListByIds(map.keySet().toArray(new Integer[map.size()])); udfFuncList.forEach(udfFunc -> { - UdfFuncParameters udfFuncParameters = JSONUtils.parseObject(JSONUtils.toJsonString(udfFunc), UdfFuncParameters.class); + UdfFuncParameters udfFuncParameters = + JSONUtils.parseObject(JSONUtils.toJsonString(udfFunc), UdfFuncParameters.class); udfFuncParameters.setDefaultFS(HadoopUtils.getInstance().getDefaultFS()); String tenantCode = processService.queryTenantCodeByResName(udfFunc.getResourceName(), ResourceType.UDF); udfFuncParameters.setTenantCode(tenantCode); @@ -379,19 +383,20 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { * @param dataQualityTaskExecutionContext dataQualityTaskExecutionContext * @param taskInstance taskInstance */ - private void setDataQualityTaskRelation(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, TaskInstance taskInstance, String tenantCode) { + private void setDataQualityTaskRelation(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, + TaskInstance taskInstance, String tenantCode) { DataQualityParameters dataQualityParameters = JSONUtils.parseObject(taskInstance.getTaskParams(), DataQualityParameters.class); if (dataQualityParameters == null) { return; } - Map config = dataQualityParameters.getRuleInputParameter(); + Map config = dataQualityParameters.getRuleInputParameter(); int ruleId = dataQualityParameters.getRuleId(); DqRule dqRule = processService.getDqRule(ruleId); if (dqRule == null) { - logger.error("can not get DqRule by id {}",ruleId); + logger.error("can not get DqRule by id {}", ruleId); return; } @@ -401,7 +406,7 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { List ruleInputEntryList = processService.getRuleInputEntry(ruleId); if (CollectionUtils.isEmpty(ruleInputEntryList)) { - logger.error("{} rule input entry list is empty ",ruleId); + logger.error("{} rule input entry list is empty ", ruleId); return; } List executeSqlList = processService.getDqExecuteSql(ruleId); @@ -412,9 +417,9 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { // set the path used to store data quality task check error data dataQualityTaskExecutionContext.setHdfsPath( PropertyUtils.getString(Constants.FS_DEFAULT_FS) - + PropertyUtils.getString( - Constants.DATA_QUALITY_ERROR_OUTPUT_PATH, - "/user/" + tenantCode + "/data_quality_error_data")); + + PropertyUtils.getString( + Constants.DATA_QUALITY_ERROR_OUTPUT_PATH, + "/user/" + tenantCode + "/data_quality_error_data")); setSourceConfig(dataQualityTaskExecutionContext, config); setTargetConfig(dataQualityTaskExecutionContext, config); @@ -460,7 +465,7 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { dqRuleExecuteSql.setIndex(1); dqRuleExecuteSql.setSql(type.getExecuteSql()); dqRuleExecuteSql.setTableAlias(type.getOutputTable()); - executeSqlList.add(0,dqRuleExecuteSql); + executeSqlList.add(0, dqRuleExecuteSql); if (Boolean.TRUE.equals(type.getInnerSource())) { dataQualityTaskExecutionContext.setComparisonNeedStatisticsValueTable(true); @@ -480,17 +485,17 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { public DataSource getDefaultDataSource() { DataSource dataSource = new DataSource(); - HikariDataSource hikariDataSource = (HikariDataSource)defaultDataSource; + HikariDataSource hikariDataSource = (HikariDataSource) defaultDataSource; dataSource.setUserName(hikariDataSource.getUsername()); JdbcInfo jdbcInfo = JdbcUrlParser.getJdbcInfo(hikariDataSource.getJdbcUrl()); if (jdbcInfo != null) { Properties properties = new Properties(); - properties.setProperty(USER,hikariDataSource.getUsername()); - properties.setProperty(PASSWORD,hikariDataSource.getPassword()); + properties.setProperty(USER, hikariDataSource.getUsername()); + properties.setProperty(PASSWORD, hikariDataSource.getPassword()); properties.setProperty(DATABASE, jdbcInfo.getDatabase()); - properties.setProperty(ADDRESS,jdbcInfo.getAddress()); - properties.setProperty(OTHER,jdbcInfo.getParams()); - properties.setProperty(JDBC_URL,jdbcInfo.getAddress() + SINGLE_SLASH + jdbcInfo.getDatabase()); + properties.setProperty(ADDRESS, jdbcInfo.getAddress()); + properties.setProperty(OTHER, jdbcInfo.getParams()); + properties.setProperty(JDBC_URL, jdbcInfo.getAddress() + SINGLE_SLASH + jdbcInfo.getDatabase()); dataSource.setType(DbType.of(JdbcUrlParser.getDbType(jdbcInfo.getDriverName()).getCode())); dataSource.setConnectionParams(JSONUtils.toJsonString(properties)); } @@ -532,9 +537,11 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { * @param dataQualityTaskExecutionContext * @param config */ - private void setTargetConfig(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, Map config) { + private void setTargetConfig(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, + Map config) { if (StringUtils.isNotEmpty(config.get(TARGET_DATASOURCE_ID))) { - DataSource dataSource = processService.findDataSourceById(Integer.parseInt(config.get(TARGET_DATASOURCE_ID))); + DataSource dataSource = + processService.findDataSourceById(Integer.parseInt(config.get(TARGET_DATASOURCE_ID))); if (dataSource != null) { ConnectorType targetConnectorType = ConnectorType.of( DbType.of(Integer.parseInt(config.get(TARGET_CONNECTOR_TYPE))).isHive() ? 1 : 0); @@ -551,7 +558,8 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { * @param dataQualityTaskExecutionContext * @param config */ - private void setSourceConfig(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, Map config) { + private void setSourceConfig(DataQualityTaskExecutionContext dataQualityTaskExecutionContext, + Map config) { if (StringUtils.isNotEmpty(config.get(SRC_DATASOURCE_ID))) { DataSource dataSource = processService.findDataSourceById(Integer.parseInt(config.get(SRC_DATASOURCE_ID))); if (dataSource != null) { @@ -586,15 +594,18 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { */ protected Map getResourceFullNames(TaskInstance taskInstance) { Map resourcesMap = new HashMap<>(); - AbstractParameters baseParam = taskPluginManager.getParameters(ParametersNode.builder().taskType(taskInstance.getTaskType()).taskParams(taskInstance.getTaskParams()).build()); + AbstractParameters baseParam = taskPluginManager.getParameters(ParametersNode.builder() + .taskType(taskInstance.getTaskType()).taskParams(taskInstance.getTaskParams()).build()); if (baseParam != null) { List projectResourceFiles = baseParam.getResourceFilesList(); if (CollectionUtils.isNotEmpty(projectResourceFiles)) { // filter the resources that the resource id equals 0 - Set oldVersionResources = projectResourceFiles.stream().filter(t -> t.getId() == 0).collect(Collectors.toSet()); + Set oldVersionResources = + projectResourceFiles.stream().filter(t -> t.getId() == 0).collect(Collectors.toSet()); if (CollectionUtils.isNotEmpty(oldVersionResources)) { - oldVersionResources.forEach(t -> resourcesMap.put(t.getRes(), processService.queryTenantCodeByResName(t.getRes(), ResourceType.FILE))); + oldVersionResources.forEach(t -> resourcesMap.put(t.getRes(), + processService.queryTenantCodeByResName(t.getRes(), ResourceType.FILE))); } // get the resource id in order to get the resource names in batch @@ -605,7 +616,8 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { Integer[] resourceIds = resourceIdsSet.toArray(new Integer[resourceIdsSet.size()]); List resources = processService.listResourceByIds(resourceIds); - resources.forEach(t -> resourcesMap.put(t.getFullName(), processService.queryTenantCodeByResName(t.getFullName(), ResourceType.FILE))); + resources.forEach(t -> resourcesMap.put(t.getFullName(), + processService.queryTenantCodeByResName(t.getFullName(), ResourceType.FILE))); } } } @@ -619,8 +631,9 @@ public abstract class BaseTaskProcessor implements ITaskProcessor { * @param taskInstance taskInstance */ private void setK8sTaskRelation(K8sTaskExecutionContext k8sTaskExecutionContext, TaskInstance taskInstance) { - K8sTaskParameters k8sTaskParameters = JSONUtils.parseObject(taskInstance.getTaskParams(), K8sTaskParameters.class); - Map namespace = JSONUtils.toMap(k8sTaskParameters.getNamespace()); + K8sTaskParameters k8sTaskParameters = + JSONUtils.parseObject(taskInstance.getTaskParams(), K8sTaskParameters.class); + Map namespace = JSONUtils.toMap(k8sTaskParameters.getNamespace()); String clusterName = namespace.get(CLUSTER); String configYaml = processService.findConfigYamlByName(clusterName); if (configYaml != null) { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BlockingTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BlockingTaskProcessor.java index be7dbe103f..5148a9733f 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BlockingTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BlockingTaskProcessor.java @@ -21,11 +21,12 @@ import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYP import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.BlockingOpportunity; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.BlockingParameters; @@ -65,15 +66,16 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { /** * complete task map */ - private Map completeTaskList = new ConcurrentHashMap<>(); + private Map completeTaskList = new ConcurrentHashMap<>(); private void initTaskParameters() { - taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), - taskInstance.getProcessInstanceId(), - taskInstance.getId())); + taskInstance.setLogPath( + LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), + taskInstance.getProcessInstanceId(), + taskInstance.getId())); this.taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort())); - this.taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + this.taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); this.taskInstance.setStartTime(new Date()); this.processService.saveTaskInstance(taskInstance); this.dependentParameters = taskInstance.getDependency(); @@ -82,7 +84,8 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { @Override protected boolean pauseTask() { - taskInstance.setState(ExecutionStatus.PAUSE); + // todo: task cannot be pause + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); logger.info("blocking task has been paused"); @@ -91,7 +94,7 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { @Override protected boolean killTask() { - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); logger.info("blocking task has been killed"); @@ -105,7 +108,8 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { @Override protected boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); if (this.taskInstance == null) { return false; } @@ -152,20 +156,21 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { dependResult = DependResult.FAILED; return dependResult; } - ExecutionStatus executionStatus = completeTaskList.get(item.getDepTaskCode()); + TaskExecutionStatus executionStatus = completeTaskList.get(item.getDepTaskCode()); if (executionStatus != item.getStatus()) { - logger.info("depend item : {} expect status: {}, actual status: {}", item.getDepTaskCode(), item.getStatus(), executionStatus); + logger.info("depend item : {} expect status: {}, actual status: {}", item.getDepTaskCode(), + item.getStatus(), executionStatus); dependResult = DependResult.FAILED; } logger.info("dependent item complete {} {},{}", - Constants.DEPENDENT_SPLIT, item.getDepTaskCode(), dependResult); + Constants.DEPENDENT_SPLIT, item.getDepTaskCode(), dependResult); return dependResult; } private void setConditionResult() { List taskInstances = processService - .findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); + .findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); for (TaskInstance task : taskInstances) { completeTaskList.putIfAbsent(task.getTaskCode(), task.getState()); } @@ -176,7 +181,8 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { for (DependentItem item : dependentTaskModel.getDependItemList()) { itemDependResult.add(getDependResultForItem(item)); } - DependResult tempResult = DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(), itemDependResult); + DependResult tempResult = + DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(), itemDependResult); tempResultList.add(tempResult); } conditionResult = DependentUtils.getDependResultForRelation(dependentParameters.getRelation(), tempResultList); @@ -184,17 +190,17 @@ public class BlockingTaskProcessor extends BaseTaskProcessor { } private void endTask() { - ExecutionStatus status = ExecutionStatus.SUCCESS; DependResult expected = this.blockingParam.getBlockingOpportunity() - .equals(BlockingOpportunity.BLOCKING_ON_SUCCESS.getDesc()) - ? DependResult.SUCCESS : DependResult.FAILED; + .equals(BlockingOpportunity.BLOCKING_ON_SUCCESS.getDesc()) + ? DependResult.SUCCESS + : DependResult.FAILED; boolean isBlocked = (expected == this.conditionResult); logger.info("blocking opportunity: expected-->{}, actual-->{}", expected, this.conditionResult); processInstance.setBlocked(isBlocked); if (isBlocked) { - processInstance.setState(ExecutionStatus.READY_BLOCK); + processInstance.setState(WorkflowExecutionStatus.READY_BLOCK); } - taskInstance.setState(status); + taskInstance.setState(TaskExecutionStatus.SUCCESS); taskInstance.setEndTime(new Date()); processService.updateTaskInstance(taskInstance); logger.info("blocking task execute complete, blocking:{}", isBlocked); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java index f8cf041ae6..46e310f44c 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java @@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.server.master.runner.task; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.server.master.dispatch.context.ExecutionContext; @@ -49,7 +49,8 @@ public class CommonTaskProcessor extends BaseTaskProcessor { @Override protected boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); return this.taskInstance != null; } @@ -92,21 +93,24 @@ public class CommonTaskProcessor extends BaseTaskProcessor { if (taskUpdateQueue == null) { this.initQueue(); } - if (taskInstance.getState().typeIsFinished()) { - logger.info("submit task , but task [{}] state [{}] is already finished. ", taskInstance.getName(), taskInstance.getState()); + if (taskInstance.getState().isFinished()) { + logger.info("submit task , but task [{}] state [{}] is already finished. ", taskInstance.getName(), + taskInstance.getState()); return true; } // task cannot be submitted because its execution state is RUNNING or DELAY. - if (taskInstance.getState() == ExecutionStatus.RUNNING_EXECUTION - || taskInstance.getState() == ExecutionStatus.DELAY_EXECUTION) { - logger.info("submit task, but the status of the task {} is already running or delayed.", taskInstance.getName()); + if (taskInstance.getState() == TaskExecutionStatus.RUNNING_EXECUTION + || taskInstance.getState() == TaskExecutionStatus.DELAY_EXECUTION) { + logger.info("submit task, but the status of the task {} is already running or delayed.", + taskInstance.getName()); return true; } logger.info("task ready to dispatch to worker: taskInstanceId: {}", taskInstance.getId()); TaskPriority taskPriority = new TaskPriority(processInstance.getProcessInstancePriority().getCode(), processInstance.getId(), taskInstance.getProcessInstancePriority().getCode(), - taskInstance.getId(), taskInstance.getTaskGroupPriority(), org.apache.dolphinscheduler.common.Constants.DEFAULT_WORKER_GROUP); + taskInstance.getId(), taskInstance.getTaskGroupPriority(), + org.apache.dolphinscheduler.common.Constants.DEFAULT_WORKER_GROUP); TaskExecutionContext taskExecutionContext = getTaskExecutionContext(taskInstance); if (taskExecutionContext == null) { @@ -137,11 +141,11 @@ public class CommonTaskProcessor extends BaseTaskProcessor { if (taskInstance == null) { return true; } - if (taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState().isFinished()) { return true; } if (StringUtils.isBlank(taskInstance.getHost())) { - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setEndTime(new Date()); processService.updateTaskInstance(taskInstance); return true; @@ -150,7 +154,8 @@ public class CommonTaskProcessor extends BaseTaskProcessor { TaskKillRequestCommand killCommand = new TaskKillRequestCommand(); killCommand.setTaskInstanceId(taskInstance.getId()); - ExecutionContext executionContext = new ExecutionContext(killCommand.convert2Command(), ExecutorType.WORKER, taskInstance); + ExecutionContext executionContext = + new ExecutionContext(killCommand.convert2Command(), ExecutorType.WORKER, taskInstance); Host host = Host.of(taskInstance.getHost()); executionContext.setHost(host); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java index 9f441df52d..91d414c590 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java @@ -19,12 +19,11 @@ package org.apache.dolphinscheduler.server.master.runner.task; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_CONDITIONS; -import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters; @@ -58,11 +57,12 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { /** * complete task map */ - private Map completeTaskList = new ConcurrentHashMap<>(); + private Map completeTaskList = new ConcurrentHashMap<>(); @Override public boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); if (this.taskInstance == null) { return false; } @@ -95,7 +95,7 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { @Override protected boolean pauseTask() { - this.taskInstance.setState(ExecutionStatus.PAUSE); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -116,7 +116,7 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { @Override protected boolean killTask() { - this.taskInstance.setState(ExecutionStatus.KILL); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -128,12 +128,13 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { } private void initTaskParameters() { - taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), - taskInstance.getProcessInstanceId(), - taskInstance.getId())); + taskInstance.setLogPath( + LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), + taskInstance.getProcessInstanceId(), + taskInstance.getId())); this.taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort())); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); this.processService.saveTaskInstance(taskInstance); this.dependentParameters = taskInstance.getDependency(); @@ -141,7 +142,8 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { private void setConditionResult() { - List taskInstances = processService.findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); + List taskInstances = + processService.findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); for (TaskInstance task : taskInstances) { completeTaskList.putIfAbsent(task.getTaskCode(), task.getState()); } @@ -152,7 +154,8 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { for (DependentItem item : dependentTaskModel.getDependItemList()) { itemDependResult.add(getDependResultForItem(item)); } - DependResult modelResult = DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(), itemDependResult); + DependResult modelResult = + DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(), itemDependResult); modelResultList.add(modelResult); } conditionResult = DependentUtils.getDependResultForRelation(dependentParameters.getRelation(), modelResultList); @@ -170,12 +173,14 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { dependResult = DependResult.FAILED; return dependResult; } - ExecutionStatus executionStatus = completeTaskList.get(item.getDepTaskCode()); + TaskExecutionStatus executionStatus = completeTaskList.get(item.getDepTaskCode()); if (executionStatus != item.getStatus()) { - logger.info("depend item : {} expect status: {}, actual status: {}", item.getDepTaskCode(), item.getStatus(), executionStatus); + logger.info("depend item : {} expect status: {}, actual status: {}", item.getDepTaskCode(), + item.getStatus(), executionStatus); dependResult = DependResult.FAILED; } - logger.info("dependent item complete, dependentTaskCode: {}, dependResult: {}", item.getDepTaskCode(), dependResult); + logger.info("dependent item complete, dependentTaskCode: {}, dependResult: {}", item.getDepTaskCode(), + dependResult); return dependResult; } @@ -183,7 +188,8 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { * */ private void endTask() { - ExecutionStatus status = (conditionResult == DependResult.SUCCESS) ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE; + TaskExecutionStatus status = + (conditionResult == DependResult.SUCCESS) ? TaskExecutionStatus.SUCCESS : TaskExecutionStatus.FAILURE; taskInstance.setState(status); taskInstance.setEndTime(new Date()); processService.updateTaskInstance(taskInstance); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java index c1fd82160d..e3f109163f 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java @@ -21,7 +21,7 @@ import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYP import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters; @@ -67,7 +67,8 @@ public class DependentTaskProcessor extends BaseTaskProcessor { @Override public boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); if (this.taskInstance == null) { return false; @@ -79,7 +80,7 @@ public class DependentTaskProcessor extends BaseTaskProcessor { taskInstance.getProcessInstanceId(), taskInstance.getId())); taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort())); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); processService.updateTaskInstance(taskInstance); initDependParameters(); @@ -139,7 +140,7 @@ public class DependentTaskProcessor extends BaseTaskProcessor { @Override protected boolean pauseTask() { - this.taskInstance.setState(ExecutionStatus.PAUSE); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -147,7 +148,7 @@ public class DependentTaskProcessor extends BaseTaskProcessor { @Override protected boolean killTask() { - this.taskInstance.setState(ExecutionStatus.KILL); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -164,7 +165,7 @@ public class DependentTaskProcessor extends BaseTaskProcessor { for (Map.Entry entry : dependentExecute.getDependResultMap().entrySet()) { if (!dependResultMap.containsKey(entry.getKey())) { dependResultMap.put(entry.getKey(), entry.getValue()); - //save depend result to log + // save depend result to log logger.info("dependent item complete, task: {}, result: {}", entry.getKey(), entry.getValue()); } } @@ -195,8 +196,8 @@ public class DependentTaskProcessor extends BaseTaskProcessor { * */ private void endTask() { - ExecutionStatus status; - status = (result == DependResult.SUCCESS) ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE; + TaskExecutionStatus status; + status = (result == DependResult.SUCCESS) ? TaskExecutionStatus.SUCCESS : TaskExecutionStatus.FAILURE; taskInstance.setState(status); taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java index 72d6a7adb4..bc753fb862 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java @@ -20,14 +20,15 @@ package org.apache.dolphinscheduler.server.master.runner.task; import com.fasterxml.jackson.core.type.TypeReference; import com.google.auto.service.AutoService; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.plugin.task.api.model.Property; -import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; +import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.server.utils.LogUtils; @@ -56,11 +57,13 @@ public class SubTaskProcessor extends BaseTaskProcessor { */ private final Lock runLock = new ReentrantLock(); - private StateEventCallbackService stateEventCallbackService = SpringApplicationContext.getBean(StateEventCallbackService.class); + private StateEventCallbackService stateEventCallbackService = + SpringApplicationContext.getBean(StateEventCallbackService.class); @Override public boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); if (this.taskInstance == null) { return false; @@ -122,9 +125,10 @@ public class SubTaskProcessor extends BaseTaskProcessor { this.processInstance.getId(), this.taskInstance.getId(), subProcessInstance.getId(), - subProcessInstance.getState().getDescp()); - if (subProcessInstance != null && subProcessInstance.getState().typeIsFinished()) { - taskInstance.setState(subProcessInstance.getState()); + subProcessInstance.getState()); + if (subProcessInstance != null && subProcessInstance.getState().isFinished()) { + // todo: check the status and transform + taskInstance.setState(TaskExecutionStatus.of(subProcessInstance.getState().getCode())); taskInstance.setEndTime(new Date()); dealFinish(); processService.saveTaskInstance(taskInstance); @@ -140,20 +144,23 @@ public class SubTaskProcessor extends BaseTaskProcessor { String subProcessInstanceVarPool = subProcessInstance.getVarPool(); if (StringUtils.isNotEmpty(subProcessInstanceVarPool)) { List varPoolProperties = JSONUtils.toList(thisTaskInstanceVarPool, Property.class); - Map taskParams = JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference>() { - }); + Map taskParams = + JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference>() { + }); Object localParams = taskParams.get(LOCAL_PARAMS); if (localParams != null) { List properties = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class); - Map subProcessParam = JSONUtils.toList(subProcessInstanceVarPool, Property.class).stream() - .collect(Collectors.toMap(Property::getProp, Property::getValue)); - List outProperties = properties.stream().filter(r -> Direct.OUT == r.getDirect()).collect(Collectors.toList()); + Map subProcessParam = + JSONUtils.toList(subProcessInstanceVarPool, Property.class).stream() + .collect(Collectors.toMap(Property::getProp, Property::getValue)); + List outProperties = + properties.stream().filter(r -> Direct.OUT == r.getDirect()).collect(Collectors.toList()); for (Property info : outProperties) { info.setValue(subProcessParam.get(info.getProp())); varPoolProperties.add(info); } taskInstance.setVarPool(JSONUtils.toJsonString(varPoolProperties)); - //deal with localParam for show in the page + // deal with localParam for show in the page processService.changeOutParam(taskInstance); } } @@ -167,11 +174,12 @@ public class SubTaskProcessor extends BaseTaskProcessor { } private boolean pauseSubWorkFlow() { - ProcessInstance subProcessInstance = processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId()); - if (subProcessInstance == null || taskInstance.getState().typeIsFinished()) { + ProcessInstance subProcessInstance = + processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId()); + if (subProcessInstance == null || taskInstance.getState().isFinished()) { return false; } - subProcessInstance.setState(ExecutionStatus.READY_PAUSE); + subProcessInstance.setState(WorkflowExecutionStatus.READY_PAUSE); processService.updateProcessInstance(subProcessInstance); sendToSubProcess(); return true; @@ -185,11 +193,11 @@ public class SubTaskProcessor extends BaseTaskProcessor { return true; } subProcessInstance = processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId()); - if (subProcessInstance == null || taskInstance.getState().typeIsFinished()) { + if (subProcessInstance == null || taskInstance.getState().isFinished()) { return false; } taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort())); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); processService.updateTaskInstance(taskInstance); logger.info("set sub work flow {} task {} state: {}", @@ -202,22 +210,23 @@ public class SubTaskProcessor extends BaseTaskProcessor { @Override protected boolean killTask() { - ProcessInstance subProcessInstance = processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId()); - if (subProcessInstance == null || taskInstance.getState().typeIsFinished()) { + ProcessInstance subProcessInstance = + processService.findSubProcessInstance(processInstance.getId(), taskInstance.getId()); + if (subProcessInstance == null || taskInstance.getState().isFinished()) { return false; } - subProcessInstance.setState(ExecutionStatus.READY_STOP); + subProcessInstance.setState(WorkflowExecutionStatus.READY_STOP); processService.updateProcessInstance(subProcessInstance); sendToSubProcess(); return true; } private void sendToSubProcess() { - StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand( - processInstance.getId(), taskInstance.getId(), subProcessInstance.getState(), subProcessInstance.getId(), 0 - ); + WorkflowStateEventChangeCommand workflowStateEventChangeCommand = new WorkflowStateEventChangeCommand( + processInstance.getId(), taskInstance.getId(), subProcessInstance.getState(), + subProcessInstance.getId(), 0); Host host = new Host(subProcessInstance.getHost()); - this.stateEventCallbackService.sendResult(host, stateEventChangeCommand.convert2Command()); + this.stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command()); } @Override diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java index 93b5a6117f..8c7c46cd6e 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java @@ -23,7 +23,7 @@ import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo; import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters; @@ -58,18 +58,20 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { @Override public boolean submitTask() { - this.taskInstance = processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); + this.taskInstance = + processService.submitTaskWithRetry(processInstance, taskInstance, maxRetryTimes, commitInterval); if (this.taskInstance == null) { return false; } this.setTaskExecutionLogger(); - taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), - taskInstance.getProcessInstanceId(), - taskInstance.getId())); + taskInstance.setLogPath( + LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(), processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), + taskInstance.getProcessInstanceId(), + taskInstance.getId())); taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort())); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setStartTime(new Date()); processService.updateTaskInstance(taskInstance); return true; @@ -78,7 +80,7 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { @Override public boolean runTask() { try { - if (!this.taskInstance().getState().typeIsFinished() && setSwitchResult()) { + if (!this.taskInstance().getState().isFinished() && setSwitchResult()) { endTaskState(); } } catch (Exception e) { @@ -102,7 +104,7 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { @Override protected boolean pauseTask() { - this.taskInstance.setState(ExecutionStatus.PAUSE); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -110,7 +112,7 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { @Override protected boolean killTask() { - this.taskInstance.setState(ExecutionStatus.KILL); + this.taskInstance.setState(TaskExecutionStatus.KILL); this.taskInstance.setEndTime(new Date()); processService.saveTaskInstance(taskInstance); return true; @@ -128,9 +130,8 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { private boolean setSwitchResult() { List taskInstances = processService.findValidTaskListByProcessId( - taskInstance.getProcessInstanceId() - ); - Map completeTaskList = new HashMap<>(); + taskInstance.getProcessInstanceId()); + Map completeTaskList = new HashMap<>(); for (TaskInstance task : taskInstances) { completeTaskList.putIfAbsent(task.getName(), task.getState()); } @@ -172,7 +173,8 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { if (!isValidSwitchResult(switchResultVos.get(finalConditionLocation))) { conditionResult = DependResult.FAILED; - logger.error("the switch task depend result is invalid, result:{}, switch branch:{}", conditionResult, finalConditionLocation); + logger.error("the switch task depend result is invalid, result:{}, switch branch:{}", conditionResult, + finalConditionLocation); return true; } @@ -184,7 +186,8 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { * update task state */ private void endTaskState() { - ExecutionStatus status = (conditionResult == DependResult.SUCCESS) ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE; + TaskExecutionStatus status = + (conditionResult == DependResult.SUCCESS) ? TaskExecutionStatus.SUCCESS : TaskExecutionStatus.FAILURE; taskInstance.setEndTime(new Date()); taskInstance.setState(status); processService.updateTaskInstance(taskInstance); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java index 856418b509..f1ba1166c5 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/MasterFailoverService.java @@ -27,7 +27,7 @@ import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.server.master.builder.TaskExecutionContextBuilder; @@ -89,11 +89,11 @@ public class MasterFailoverService { @Timed(value = "ds.master.scheduler.failover.check.time", percentiles = {0.5, 0.75, 0.95, 0.99}, histogram = true) public void checkMasterFailover() { List needFailoverMasterHosts = processService.queryNeedFailoverProcessInstanceHost() - .stream() - // failover myself || dead server - .filter(host -> localAddress.equals(host) || !registryClient.checkNodeExists(host, NodeType.MASTER)) - .distinct() - .collect(Collectors.toList()); + .stream() + // failover myself || dead server + .filter(host -> localAddress.equals(host) || !registryClient.checkNodeExists(host, NodeType.MASTER)) + .distinct() + .collect(Collectors.toList()); if (CollectionUtils.isEmpty(needFailoverMasterHosts)) { return; } @@ -127,18 +127,18 @@ public class MasterFailoverService { StopWatch failoverTimeCost = StopWatch.createStarted(); Optional masterStartupTimeOptional = getServerStartupTime(registryClient.getServerList(NodeType.MASTER), - masterHost); + masterHost); List needFailoverProcessInstanceList = processService.queryNeedFailoverProcessInstances( - masterHost); + masterHost); if (CollectionUtils.isEmpty(needFailoverProcessInstanceList)) { return; } LOGGER.info( - "Master[{}] failover starting there are {} workflowInstance may need to failover, will do a deep check, workflowInstanceIds: {}", - masterHost, - needFailoverProcessInstanceList.size(), - needFailoverProcessInstanceList.stream().map(ProcessInstance::getId).collect(Collectors.toList())); + "Master[{}] failover starting there are {} workflowInstance may need to failover, will do a deep check, workflowInstanceIds: {}", + masterHost, + needFailoverProcessInstanceList.size(), + needFailoverProcessInstanceList.stream().map(ProcessInstance::getId).collect(Collectors.toList())); for (ProcessInstance processInstance : needFailoverProcessInstanceList) { try { @@ -149,9 +149,9 @@ public class MasterFailoverService { continue; } // todo: use batch query - ProcessDefinition processDefinition - = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + ProcessDefinition processDefinition = + processService.findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); processInstance.setProcessDefinition(processDefinition); int processInstanceId = processInstance.getId(); List taskInstanceList = processService.findValidTaskListByProcessId(processInstanceId); @@ -171,7 +171,7 @@ public class MasterFailoverService { } ProcessInstanceMetrics.incProcessInstanceByState("failover"); - //updateProcessInstance host is null to mark this processInstance has been failover + // updateProcessInstance host is null to mark this processInstance has been failover // and insert a failover command processInstance.setHost(Constants.NULL); processService.processNeedFailoverProcessInstances(processInstance); @@ -183,8 +183,8 @@ public class MasterFailoverService { failoverTimeCost.stop(); LOGGER.info("Master[{}] failover finished, useTime:{}ms", - masterHost, - failoverTimeCost.getTime(TimeUnit.MILLISECONDS)); + masterHost, + failoverTimeCost.getTime(TimeUnit.MILLISECONDS)); } private Optional getServerStartupTime(List servers, String host) { @@ -220,10 +220,10 @@ public class MasterFailoverService { if (!isMasterTask) { LOGGER.info("The failover taskInstance is not master task"); TaskExecutionContext taskExecutionContext = TaskExecutionContextBuilder.get() - .buildTaskInstanceRelatedInfo(taskInstance) - .buildProcessInstanceRelatedInfo(processInstance) - .buildProcessDefinitionRelatedInfo(processInstance.getProcessDefinition()) - .create(); + .buildTaskInstanceRelatedInfo(taskInstance) + .buildProcessInstanceRelatedInfo(processInstance) + .buildProcessDefinitionRelatedInfo(processInstance.getProcessDefinition()) + .create(); if (masterConfig.isKillYarnJobWhenTaskFailover()) { // only kill yarn job if exists , the local thread has exited @@ -238,7 +238,7 @@ public class MasterFailoverService { LOGGER.info("The failover taskInstance is a master task"); } - taskInstance.setState(ExecutionStatus.NEED_FAULT_TOLERANCE); + taskInstance.setState(TaskExecutionStatus.NEED_FAULT_TOLERANCE); taskInstance.setFlag(Flag.NO); processService.saveTaskInstance(taskInstance); } @@ -258,7 +258,7 @@ public class MasterFailoverService { } private boolean checkTaskInstanceNeedFailover(@NonNull TaskInstance taskInstance) { - if (taskInstance.getState() != null && taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState() != null && taskInstance.getState().isFinished()) { // The task is already finished, so we don't need to failover this task instance return false; } @@ -267,7 +267,8 @@ public class MasterFailoverService { private boolean checkProcessInstanceNeedFailover(Optional beFailoveredMasterStartupTimeOptional, @NonNull ProcessInstance processInstance) { - // The process has already been failover, since when we do master failover we will hold a lock, so we can guarantee + // The process has already been failover, since when we do master failover we will hold a lock, so we can + // guarantee // the host will not be set concurrent. if (Constants.NULL.equals(processInstance.getHost())) { return false; diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java index d817e67fe2..99c62f1172 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/service/WorkerFailoverService.java @@ -27,11 +27,11 @@ import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.server.master.builder.TaskExecutionContextBuilder; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; -import org.apache.dolphinscheduler.server.master.event.StateEvent; +import org.apache.dolphinscheduler.server.master.event.TaskStateEvent; import org.apache.dolphinscheduler.server.master.metrics.TaskMetrics; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool; @@ -99,7 +99,7 @@ public class WorkerFailoverService { // we query the task instance from cache, so that we can directly update the cache final Optional needFailoverWorkerStartTime = - getServerStartupTime(registryClient.getServerList(NodeType.WORKER), workerHost); + getServerStartupTime(registryClient.getServerList(NodeType.WORKER), workerHost); final List needFailoverTaskInstanceList = getNeedFailoverTaskInstance(workerHost); if (CollectionUtils.isEmpty(needFailoverTaskInstanceList)) { @@ -107,30 +107,30 @@ public class WorkerFailoverService { return; } LOGGER.info( - "Worker[{}] failover there are {} taskInstance may need to failover, will do a deep check, taskInstanceIds: {}", - workerHost, - needFailoverTaskInstanceList.size(), - needFailoverTaskInstanceList.stream().map(TaskInstance::getId).collect(Collectors.toList())); + "Worker[{}] failover there are {} taskInstance may need to failover, will do a deep check, taskInstanceIds: {}", + workerHost, + needFailoverTaskInstanceList.size(), + needFailoverTaskInstanceList.stream().map(TaskInstance::getId).collect(Collectors.toList())); final Map processInstanceCacheMap = new HashMap<>(); for (TaskInstance taskInstance : needFailoverTaskInstanceList) { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(taskInstance.getProcessInstanceId(), taskInstance.getId()); try { ProcessInstance processInstance = processInstanceCacheMap.computeIfAbsent( - taskInstance.getProcessInstanceId(), k -> { - WorkflowExecuteRunnable workflowExecuteRunnable = cacheManager.getByProcessInstanceId( - taskInstance.getProcessInstanceId()); - if (workflowExecuteRunnable == null) { - return null; - } - return workflowExecuteRunnable.getProcessInstance(); - }); + taskInstance.getProcessInstanceId(), k -> { + WorkflowExecuteRunnable workflowExecuteRunnable = cacheManager.getByProcessInstanceId( + taskInstance.getProcessInstanceId()); + if (workflowExecuteRunnable == null) { + return null; + } + return workflowExecuteRunnable.getProcessInstance(); + }); if (!checkTaskInstanceNeedFailover(needFailoverWorkerStartTime, processInstance, taskInstance)) { LOGGER.info("Worker[{}] the current taskInstance doesn't need to failover", workerHost); continue; } LOGGER.info( - "Worker[{}] failover: begin to failover taskInstance, will set the status to NEED_FAULT_TOLERANCE", - workerHost); + "Worker[{}] failover: begin to failover taskInstance, will set the status to NEED_FAULT_TOLERANCE", + workerHost); failoverTaskInstance(processInstance, taskInstance); LOGGER.info("Worker[{}] failover: Finish failover taskInstance", workerHost); } catch (Exception ex) { @@ -141,8 +141,8 @@ public class WorkerFailoverService { } failoverTimeCost.stop(); LOGGER.info("Worker[{}] failover finished, useTime:{}ms", - workerHost, - failoverTimeCost.getTime(TimeUnit.MILLISECONDS)); + workerHost, + failoverTimeCost.getTime(TimeUnit.MILLISECONDS)); } /** @@ -164,10 +164,10 @@ public class WorkerFailoverService { if (!isMasterTask) { LOGGER.info("The failover taskInstance is not master task"); TaskExecutionContext taskExecutionContext = TaskExecutionContextBuilder.get() - .buildTaskInstanceRelatedInfo(taskInstance) - .buildProcessInstanceRelatedInfo(processInstance) - .buildProcessDefinitionRelatedInfo(processInstance.getProcessDefinition()) - .create(); + .buildTaskInstanceRelatedInfo(taskInstance) + .buildProcessInstanceRelatedInfo(processInstance) + .buildProcessDefinitionRelatedInfo(processInstance.getProcessDefinition()) + .create(); if (masterConfig.isKillYarnJobWhenTaskFailover()) { // only kill yarn job if exists , the local thread has exited @@ -178,15 +178,16 @@ public class WorkerFailoverService { LOGGER.info("The failover taskInstance is a master task"); } - taskInstance.setState(ExecutionStatus.NEED_FAULT_TOLERANCE); + taskInstance.setState(TaskExecutionStatus.NEED_FAULT_TOLERANCE); taskInstance.setFlag(Flag.NO); processService.saveTaskInstance(taskInstance); - StateEvent stateEvent = new StateEvent(); - stateEvent.setTaskInstanceId(taskInstance.getId()); - stateEvent.setType(StateEventType.TASK_STATE_CHANGE); - stateEvent.setProcessInstanceId(processInstance.getId()); - stateEvent.setExecutionStatus(taskInstance.getState()); + TaskStateEvent stateEvent = TaskStateEvent.builder() + .processInstanceId(processInstance.getId()) + .taskInstanceId(taskInstance.getId()) + .status(TaskExecutionStatus.NEED_FAULT_TOLERANCE) + .type(StateEventType.TASK_STATE_CHANGE) + .build(); workflowExecuteThreadPool.submitStateEvent(stateEvent); } @@ -201,7 +202,7 @@ public class WorkerFailoverService { if (processInstance == null) { // This case should be happened. LOGGER.error( - "Failover task instance error, cannot find the related processInstance form memory, this case shouldn't happened"); + "Failover task instance error, cannot find the related processInstance form memory, this case shouldn't happened"); return false; } if (taskInstance == null) { @@ -212,12 +213,12 @@ public class WorkerFailoverService { // only failover the task owned myself if worker down. if (!StringUtils.equalsIgnoreCase(processInstance.getHost(), localAddress)) { LOGGER.error( - "Master failover task instance error, the taskInstance's processInstance's host: {} is not the current master: {}", - processInstance.getHost(), - localAddress); + "Master failover task instance error, the taskInstance's processInstance's host: {} is not the current master: {}", + processInstance.getHost(), + localAddress); return false; } - if (taskInstance.getState() != null && taskInstance.getState().typeIsFinished()) { + if (taskInstance.getState() != null && taskInstance.getState().isFinished()) { // The taskInstance is already finished, doesn't need to failover LOGGER.info("The task is already finished, doesn't need to failover"); return false; @@ -228,11 +229,11 @@ public class WorkerFailoverService { } // The worker is active, may already send some new task to it if (taskInstance.getSubmitTime() != null && taskInstance.getSubmitTime() - .after(needFailoverWorkerStartTime.get())) { + .after(needFailoverWorkerStartTime.get())) { LOGGER.info( - "The taskInstance's submitTime: {} is after the need failover worker's start time: {}, the taskInstance is newly submit, it doesn't need to failover", - taskInstance.getSubmitTime(), - needFailoverWorkerStartTime.get()); + "The taskInstance's submitTime: {} is after the need failover worker's start time: {}, the taskInstance is newly submit, it doesn't need to failover", + taskInstance.getSubmitTime(), + needFailoverWorkerStartTime.get()); return false; } @@ -242,12 +243,12 @@ public class WorkerFailoverService { private List getNeedFailoverTaskInstance(@NonNull String failoverWorkerHost) { // we query the task instance from cache, so that we can directly update the cache return cacheManager.getAll() - .stream() - .flatMap(workflowExecuteRunnable -> workflowExecuteRunnable.getAllTaskInstances().stream()) - // If the worker is in dispatching and the host is not set - .filter(taskInstance -> failoverWorkerHost.equals(taskInstance.getHost()) - && ExecutionStatus.isNeedFailoverWorkflowInstanceState(taskInstance.getState())) - .collect(Collectors.toList()); + .stream() + .flatMap(workflowExecuteRunnable -> workflowExecuteRunnable.getAllTaskInstances().stream()) + // If the worker is in dispatching and the host is not set + .filter(taskInstance -> failoverWorkerHost.equals(taskInstance.getHost()) + && taskInstance.getState().shouldFailover()) + .collect(Collectors.toList()); } private Optional getServerStartupTime(List servers, String host) { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DataQualityResultOperator.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DataQualityResultOperator.java index f268ea62eb..42d9d14e49 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DataQualityResultOperator.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DataQualityResultOperator.java @@ -22,7 +22,7 @@ import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYP import org.apache.dolphinscheduler.dao.entity.DqExecuteResult; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.CheckType; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqFailureStrategy; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState; @@ -67,11 +67,11 @@ public class DataQualityResultOperator { Integer.parseInt(String.valueOf(taskInstance.getProcessInstanceId()))); // when the task is failure or cancel, will delete the execute result and statistics value - if (taskResponseEvent.getState().typeIsFailure() - || taskResponseEvent.getState().typeIsCancel()) { + if (taskResponseEvent.getState().isFailure() + || taskResponseEvent.getState().isKill()) { processService.deleteDqExecuteResultByTaskInstanceId(taskInstance.getId()); processService.deleteTaskStatisticsValueByTaskInstanceId(taskInstance.getId()); - sendDqTaskErrorAlert(taskInstance,processInstance); + sendDqTaskErrorAlert(taskInstance, processInstance); return; } @@ -79,7 +79,7 @@ public class DataQualityResultOperator { DqExecuteResult dqExecuteResult = processService.getDqExecuteResultByTaskInstanceId(taskInstance.getId()); if (dqExecuteResult != null) { - //check the result ,if result is failure do some operator by failure strategy + // check the result ,if result is failure do some operator by failure strategy checkDqExecuteResult(taskResponseEvent, dqExecuteResult, processInstance); } } @@ -99,13 +99,13 @@ public class DataQualityResultOperator { DqFailureStrategy dqFailureStrategy = DqFailureStrategy.of(dqExecuteResult.getFailureStrategy()); if (dqFailureStrategy != null) { dqExecuteResult.setState(DqTaskState.FAILURE.getCode()); - sendDqTaskResultAlert(dqExecuteResult,processInstance); + sendDqTaskResultAlert(dqExecuteResult, processInstance); switch (dqFailureStrategy) { case ALERT: logger.info("task is failure, continue and alert"); break; case BLOCK: - taskResponseEvent.setState(ExecutionStatus.FAILURE); + taskResponseEvent.setState(TaskExecutionStatus.FAILURE); logger.info("task is failure, end and alert"); break; default: @@ -139,23 +139,23 @@ public class DataQualityResultOperator { switch (checkType) { case COMPARISON_MINUS_STATISTICS: srcValue = comparisonValue - statisticsValue; - isFailure = getCompareResult(operatorType,srcValue,threshold); + isFailure = getCompareResult(operatorType, srcValue, threshold); break; case STATISTICS_MINUS_COMPARISON: srcValue = statisticsValue - comparisonValue; - isFailure = getCompareResult(operatorType,srcValue,threshold); + isFailure = getCompareResult(operatorType, srcValue, threshold); break; case STATISTICS_COMPARISON_PERCENTAGE: if (comparisonValue > 0) { srcValue = statisticsValue / comparisonValue * 100; } - isFailure = getCompareResult(operatorType,srcValue,threshold); + isFailure = getCompareResult(operatorType, srcValue, threshold); break; case STATISTICS_COMPARISON_DIFFERENCE_COMPARISON_PERCENTAGE: if (comparisonValue > 0) { srcValue = Math.abs(comparisonValue - statisticsValue) / comparisonValue * 100; } - isFailure = getCompareResult(operatorType,srcValue,threshold); + isFailure = getCompareResult(operatorType, srcValue, threshold); break; default: break; @@ -166,11 +166,11 @@ public class DataQualityResultOperator { } private void sendDqTaskResultAlert(DqExecuteResult dqExecuteResult, ProcessInstance processInstance) { - alertManager.sendDataQualityTaskExecuteResultAlert(dqExecuteResult,processInstance); + alertManager.sendDataQualityTaskExecuteResultAlert(dqExecuteResult, processInstance); } private void sendDqTaskErrorAlert(TaskInstance taskInstance, ProcessInstance processInstance) { - alertManager.sendTaskErrorAlert(taskInstance,processInstance); + alertManager.sendTaskErrorAlert(taskInstance, processInstance); } private boolean getCompareResult(OperatorType operatorType, double srcValue, double targetValue) { diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java index 445a9ac0bd..2a358ecbcd 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java @@ -22,7 +22,7 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; import org.apache.dolphinscheduler.plugin.task.api.enums.DependentRelation; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.utils.DependentUtils; @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; * dependent item execute */ public class DependentExecute { + /** * process service */ @@ -91,7 +92,8 @@ public class DependentExecute { * @return DependResult */ private DependResult getDependentResultForItem(DependentItem dependentItem, Date currentTime) { - List dateIntervals = DependentUtils.getDateIntervalList(currentTime, dependentItem.getDateValue()); + List dateIntervals = + DependentUtils.getDateIntervalList(currentTime, dependentItem.getDateValue()); return calculateResultForTasks(dependentItem, dateIntervals); } @@ -131,10 +133,10 @@ public class DependentExecute { * @return */ private DependResult dependResultByProcessInstance(ProcessInstance processInstance) { - if (!processInstance.getState().typeIsFinished()) { + if (!processInstance.getState().isFinished()) { return DependResult.WAITING; } - if (processInstance.getState().typeIsSuccess()) { + if (processInstance.getState().isSuccess()) { return DependResult.SUCCESS; } return DependResult.FAILED; @@ -162,7 +164,7 @@ public class DependentExecute { if (taskInstance == null) { // cannot find task in the process instance // maybe because process instance is running or failed. - if (processInstance.getState().typeIsFinished()) { + if (processInstance.getState().isFinished()) { result = DependResult.FAILED; } else { return DependResult.WAITING; @@ -185,12 +187,14 @@ public class DependentExecute { */ private ProcessInstance findLastProcessInterval(Long definitionCode, DateInterval dateInterval) { - ProcessInstance runningProcess = processService.findLastRunningProcess(definitionCode, dateInterval.getStartTime(), dateInterval.getEndTime()); + ProcessInstance runningProcess = processService.findLastRunningProcess(definitionCode, + dateInterval.getStartTime(), dateInterval.getEndTime()); if (runningProcess != null) { return runningProcess; } - ProcessInstance lastSchedulerProcess = processService.findLastSchedulerProcessInterval(definitionCode, dateInterval); + ProcessInstance lastSchedulerProcess = + processService.findLastSchedulerProcessInterval(definitionCode, dateInterval); ProcessInstance lastManualProcess = processService.findLastManualProcessInterval(definitionCode, dateInterval); @@ -201,7 +205,8 @@ public class DependentExecute { return lastManualProcess; } - return (lastManualProcess.getEndTime().after(lastSchedulerProcess.getEndTime())) ? lastManualProcess : lastSchedulerProcess; + return (lastManualProcess.getEndTime().after(lastSchedulerProcess.getEndTime())) ? lastManualProcess + : lastSchedulerProcess; } /** @@ -210,35 +215,17 @@ public class DependentExecute { * @param state state * @return DependResult */ - private DependResult getDependResultByState(ExecutionStatus state) { + private DependResult getDependResultByState(TaskExecutionStatus state) { - if (!state.typeIsFinished()) { + if (!state.isFinished()) { return DependResult.WAITING; - } else if (state.typeIsSuccess()) { + } else if (state.isSuccess()) { return DependResult.SUCCESS; } else { return DependResult.FAILED; } } - /** - * get dependent result by task instance state when task instance is null - * - * @param state state - * @return DependResult - */ - private DependResult getDependResultByProcessStateWhenTaskNull(ExecutionStatus state) { - - if (state.typeIsRunning() - || state == ExecutionStatus.SUBMITTED_SUCCESS - || state == ExecutionStatus.DISPATCH - || state == ExecutionStatus.WAITING_THREAD) { - return DependResult.WAITING; - } else { - return DependResult.FAILED; - } - } - /** * judge depend item finished * diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java index 64bc291152..eeef4b2c2e 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/BlockingTaskTest.java @@ -19,6 +19,8 @@ package org.apache.dolphinscheduler.server.master; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_BLOCKING; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.model.TaskNode; @@ -27,7 +29,6 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependentRelation; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.BlockingParameters; @@ -87,22 +88,22 @@ public class BlockingTaskTest { // mock process instance processInstance = getProcessInstance(); Mockito.when(processService - .findProcessInstanceById(processInstance.getId())) - .thenReturn(processInstance); + .findProcessInstanceById(processInstance.getId())) + .thenReturn(processInstance); TaskDefinition taskDefinition = new TaskDefinition(); taskDefinition.setTimeoutFlag(TimeoutFlag.OPEN); taskDefinition.setTimeoutNotifyStrategy(TaskTimeoutStrategy.WARN); taskDefinition.setTimeout(0); Mockito.when(processService.findTaskDefinition(1L, 1)) - .thenReturn(taskDefinition); + .thenReturn(taskDefinition); } private ProcessInstance getProcessInstance() { // mock process instance ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(1000); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setProcessDefinitionCode(1L); return processInstance; @@ -118,13 +119,12 @@ public class BlockingTaskTest { taskInstance.setTaskDefinitionVersion(taskNode.getVersion()); taskInstance.setProcessInstanceId(processInstance.getId()); taskInstance.setTaskParams(taskNode.getTaskParams()); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); taskInstance.setFirstSubmitTime(new Date()); Mockito.when(processService - .submitTaskWithRetry(Mockito.any(ProcessInstance.class) - , Mockito.any(TaskInstance.class) - , Mockito.any(Integer.class), Mockito.any(Long.class))) - .thenReturn(taskInstance); + .submitTaskWithRetry(Mockito.any(ProcessInstance.class), Mockito.any(TaskInstance.class), + Mockito.any(Integer.class), Mockito.any(Long.class))) + .thenReturn(taskInstance); return taskInstance; } @@ -144,20 +144,20 @@ public class BlockingTaskTest { DependentItem dependentItemA = new DependentItem(); dependentItemA.setDepTaskCode(1L); - dependentItemA.setStatus(ExecutionStatus.SUCCESS); + dependentItemA.setStatus(TaskExecutionStatus.SUCCESS); DependentItem dependentItemB = new DependentItem(); dependentItemB.setDepTaskCode(2L); - dependentItemB.setStatus(ExecutionStatus.SUCCESS); + dependentItemB.setStatus(TaskExecutionStatus.SUCCESS); DependentItem dependentItemC = new DependentItem(); dependentItemC.setDepTaskCode(3L); - dependentItemC.setStatus(ExecutionStatus.SUCCESS); + dependentItemC.setStatus(TaskExecutionStatus.SUCCESS); // build relation DependentTaskModel dependentTaskModel = new DependentTaskModel(); dependentTaskModel.setDependItemList(Stream.of(dependentItemA, dependentItemB, dependentItemC) - .collect(Collectors.toList())); + .collect(Collectors.toList())); dependentTaskModel.setRelation(DependentRelation.AND); DependentParameters dependentParameters = new DependentParameters(); @@ -176,40 +176,39 @@ public class BlockingTaskTest { return taskNode; } - private TaskInstance testBasicInit(String blockingCondition, ExecutionStatus... expectResults) { + private TaskInstance testBasicInit(String blockingCondition, TaskExecutionStatus... expectResults) { TaskInstance taskInstance = getTaskInstance(getTaskNode(blockingCondition), processInstance); Mockito.when(processService - .submitTask(processInstance, taskInstance)) - .thenReturn(taskInstance); + .submitTask(processInstance, taskInstance)) + .thenReturn(taskInstance); Mockito.when(processService - .findTaskInstanceById(taskInstance.getId())) - .thenReturn(taskInstance); + .findTaskInstanceById(taskInstance.getId())) + .thenReturn(taskInstance); // for BlockingTaskExecThread.initTaskParameters Mockito.when(processService - .saveTaskInstance(taskInstance)) - .thenReturn(true); + .saveTaskInstance(taskInstance)) + .thenReturn(true); // for BlockingTaskExecThread.updateTaskState Mockito.when(processService - .updateTaskInstance(taskInstance)) - .thenReturn(true); + .updateTaskInstance(taskInstance)) + .thenReturn(true); // for BlockingTaskExecThread.waitTaskQuit List conditions = getTaskInstanceForValidTaskList(expectResults); - Mockito.when(processService. - findValidTaskListByProcessId(processInstance.getId())) - .thenReturn(conditions); + Mockito.when(processService.findValidTaskListByProcessId(processInstance.getId())) + .thenReturn(conditions); return taskInstance; } /** * mock task instance and its execution result in front of blocking node */ - private List getTaskInstanceForValidTaskList(ExecutionStatus... status) { + private List getTaskInstanceForValidTaskList(TaskExecutionStatus... status) { List taskInstanceList = new ArrayList<>(); for (int i = 1; i <= status.length; i++) { TaskInstance taskInstance = new TaskInstance(); @@ -224,7 +223,7 @@ public class BlockingTaskTest { @Test public void testBlockingTaskSubmit() { TaskInstance taskInstance = testBasicInit("BlockingOnFailed", - ExecutionStatus.SUCCESS, ExecutionStatus.FAILURE, ExecutionStatus.SUCCESS); + TaskExecutionStatus.SUCCESS, TaskExecutionStatus.FAILURE, TaskExecutionStatus.SUCCESS); BlockingTaskProcessor blockingTaskProcessor = new BlockingTaskProcessor(); blockingTaskProcessor.init(taskInstance, processInstance); boolean res = blockingTaskProcessor.action(TaskAction.SUBMIT); @@ -234,36 +233,36 @@ public class BlockingTaskTest { @Test public void testPauseTask() { TaskInstance taskInstance = testBasicInit("BlockingOnFailed", - ExecutionStatus.SUCCESS, ExecutionStatus.FAILURE, ExecutionStatus.SUCCESS); + TaskExecutionStatus.SUCCESS, TaskExecutionStatus.FAILURE, TaskExecutionStatus.SUCCESS); BlockingTaskProcessor blockingTaskProcessor = new BlockingTaskProcessor(); blockingTaskProcessor.init(taskInstance, processInstance); blockingTaskProcessor.action(TaskAction.SUBMIT); blockingTaskProcessor.action(TaskAction.PAUSE); - ExecutionStatus status = taskInstance.getState(); - Assert.assertEquals(ExecutionStatus.PAUSE, status); + TaskExecutionStatus status = taskInstance.getState(); + Assert.assertEquals(TaskExecutionStatus.KILL, status); } @Test public void testBlocking() { TaskInstance taskInstance = testBasicInit("BlockingOnFailed", - ExecutionStatus.SUCCESS, ExecutionStatus.FAILURE, ExecutionStatus.SUCCESS); + TaskExecutionStatus.SUCCESS, TaskExecutionStatus.FAILURE, TaskExecutionStatus.SUCCESS); BlockingTaskProcessor blockingTaskProcessor = new BlockingTaskProcessor(); blockingTaskProcessor.init(taskInstance, processInstance); blockingTaskProcessor.action(TaskAction.SUBMIT); blockingTaskProcessor.action(TaskAction.RUN); - ExecutionStatus status = processInstance.getState(); - Assert.assertEquals(ExecutionStatus.READY_BLOCK, status); + WorkflowExecutionStatus status = processInstance.getState(); + Assert.assertEquals(WorkflowExecutionStatus.READY_BLOCK, status); } @Test public void testNoneBlocking() { TaskInstance taskInstance = testBasicInit("BlockingOnSuccess", - ExecutionStatus.SUCCESS, ExecutionStatus.SUCCESS, ExecutionStatus.SUCCESS); + TaskExecutionStatus.SUCCESS, TaskExecutionStatus.SUCCESS, TaskExecutionStatus.SUCCESS); BlockingTaskProcessor blockingTaskProcessor = new BlockingTaskProcessor(); blockingTaskProcessor.init(taskInstance, processInstance); blockingTaskProcessor.action(TaskAction.SUBMIT); blockingTaskProcessor.action(TaskAction.RUN); - ExecutionStatus status = processInstance.getState(); - Assert.assertEquals(ExecutionStatus.RUNNING_EXECUTION, status); + WorkflowExecutionStatus status = processInstance.getState(); + Assert.assertEquals(WorkflowExecutionStatus.RUNNING_EXECUTION, status); } } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java index 7d01c44746..1716ac1068 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/ConditionsTaskTest.java @@ -17,6 +17,8 @@ package org.apache.dolphinscheduler.server.master; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.model.TaskNode; @@ -25,7 +27,6 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependentRelation; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.ConditionsParameters; @@ -85,7 +86,7 @@ public class ConditionsTaskTest { .thenReturn(taskDefinition); } - private TaskInstance testBasicInit(ExecutionStatus expectResult) { + private TaskInstance testBasicInit(TaskExecutionStatus expectResult) { TaskInstance taskInstance = getTaskInstance(getTaskNode(), processInstance); // for MasterBaseTaskExecThread.submit @@ -107,8 +108,7 @@ public class ConditionsTaskTest { // for ConditionsTaskExecThread.waitTaskQuit List conditions = Stream.of( - getTaskInstanceForValidTaskList(expectResult) - ).collect(Collectors.toList()); + getTaskInstanceForValidTaskList(expectResult)).collect(Collectors.toList()); Mockito.when(processService .findValidTaskListByProcessId(processInstance.getId())) .thenReturn(conditions); @@ -117,18 +117,18 @@ public class ConditionsTaskTest { @Test public void testBasicSuccess() { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.SUCCESS); - //ConditionTaskProcessor taskExecThread = new onditionsTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); + TaskInstance taskInstance = testBasicInit(TaskExecutionStatus.SUCCESS); + // ConditionTaskProcessor taskExecThread = new onditionsTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); } @Test public void testBasicFailure() { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.FAILURE); - //ConditionsTaskExecThread taskExecThread = new ConditionsTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.FAILURE, taskExecThread.getTaskInstance().getState()); + TaskInstance taskInstance = testBasicInit(TaskExecutionStatus.FAILURE); + // ConditionsTaskExecThread taskExecThread = new ConditionsTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.FAILURE, taskExecThread.getTaskInstance().getState()); } private TaskNode getTaskNode() { @@ -142,7 +142,7 @@ public class ConditionsTaskTest { DependentItem dependentItem = new DependentItem(); dependentItem.setDepTaskCode(11L); - dependentItem.setStatus(ExecutionStatus.SUCCESS); + dependentItem.setStatus(TaskExecutionStatus.SUCCESS); DependentTaskModel dependentTaskModel = new DependentTaskModel(); dependentTaskModel.setDependItemList(Stream.of(dependentItem).collect(Collectors.toList())); @@ -168,7 +168,7 @@ public class ConditionsTaskTest { private ProcessInstance getProcessInstance() { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(1000); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); return processInstance; } @@ -185,7 +185,7 @@ public class ConditionsTaskTest { return taskInstance; } - private TaskInstance getTaskInstanceForValidTaskList(ExecutionStatus state) { + private TaskInstance getTaskInstanceForValidTaskList(TaskExecutionStatus state) { TaskInstance taskInstance = new TaskInstance(); taskInstance.setId(1001); taskInstance.setName("1"); diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java index 50b03c86e2..66b25eb351 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/DependentTaskTest.java @@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.server.master; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.thread.Stopper; import org.apache.dolphinscheduler.common.utils.JSONUtils; @@ -27,7 +28,7 @@ import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; import org.apache.dolphinscheduler.plugin.task.api.enums.DependentRelation; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DependentItem; import org.apache.dolphinscheduler.plugin.task.api.model.DependentTaskModel; import org.apache.dolphinscheduler.plugin.task.api.parameters.DependentParameters; @@ -57,7 +58,6 @@ public class DependentTaskTest { */ public static final String FLOWNODE_RUN_FLAG_NORMAL = "NORMAL"; - public static final Long TASK_CODE = 1111L; public static final Long DEPEND_TASK_CODE_A = 110L; public static final Long DEPEND_TASK_CODE_B = 111L; @@ -129,8 +129,7 @@ public class DependentTaskTest { DependentTaskModel dependentTaskModel = new DependentTaskModel(); dependentTaskModel.setRelation(DependentRelation.AND); dependentTaskModel.setDependItemList(Stream.of( - getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day") - ).collect(Collectors.toList())); + getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day")).collect(Collectors.toList())); DependentParameters dependentParameters = new DependentParameters(); dependentParameters.setRelation(DependentRelation.AND); @@ -146,7 +145,7 @@ public class DependentTaskTest { public void testBasicSuccess() { testBasicInit(); ProcessInstance dependentProcessInstance = - getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.FAILURE); + getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.FAILURE); // for DependentExecute.findLastProcessInterval Mockito.when(processService .findLastRunningProcess(Mockito.eq(2L), Mockito.any(), Mockito.any())) @@ -156,9 +155,11 @@ public class DependentTaskTest { Mockito.when(processService .findValidTaskListByProcessId(200)) .thenReturn(Stream.of( - getTaskInstanceForValidTaskList(2000, ExecutionStatus.SUCCESS, DEPEND_TASK_CODE_A, dependentProcessInstance), - getTaskInstanceForValidTaskList(2000, ExecutionStatus.FAILURE, DEPEND_TASK_CODE_B, dependentProcessInstance) - ).collect(Collectors.toList())); + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.SUCCESS, DEPEND_TASK_CODE_A, + dependentProcessInstance), + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.FAILURE, DEPEND_TASK_CODE_B, + dependentProcessInstance)) + .collect(Collectors.toList())); } @@ -166,7 +167,7 @@ public class DependentTaskTest { public void testBasicFailure() { testBasicInit(); ProcessInstance dependentProcessInstance = - getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.SUCCESS); + getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.SUCCESS); // for DependentExecute.findLastProcessInterval Mockito.when(processService .findLastRunningProcess(Mockito.eq(2L), Mockito.any(), Mockito.any())) @@ -176,9 +177,11 @@ public class DependentTaskTest { Mockito.when(processService .findValidTaskListByProcessId(200)) .thenReturn(Stream.of( - getTaskInstanceForValidTaskList(2000, ExecutionStatus.FAILURE, DEPEND_TASK_CODE_A, dependentProcessInstance), - getTaskInstanceForValidTaskList(2000, ExecutionStatus.SUCCESS, DEPEND_TASK_CODE_B, dependentProcessInstance) - ).collect(Collectors.toList())); + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.FAILURE, DEPEND_TASK_CODE_A, + dependentProcessInstance), + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.SUCCESS, DEPEND_TASK_CODE_B, + dependentProcessInstance)) + .collect(Collectors.toList())); } @Test @@ -187,35 +190,31 @@ public class DependentTaskTest { dependentTaskModel1.setRelation(DependentRelation.AND); dependentTaskModel1.setDependItemList(Stream.of( getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day"), - getDependentItemFromTaskNode(3L, DEPEND_TASK_CODE_B, "today", "day") - ).collect(Collectors.toList())); + getDependentItemFromTaskNode(3L, DEPEND_TASK_CODE_B, "today", "day")).collect(Collectors.toList())); DependentTaskModel dependentTaskModel2 = new DependentTaskModel(); dependentTaskModel2.setRelation(DependentRelation.OR); dependentTaskModel2.setDependItemList(Stream.of( getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day"), - getDependentItemFromTaskNode(3L, DEPEND_TASK_CODE_C, "today", "day") - ).collect(Collectors.toList())); + getDependentItemFromTaskNode(3L, DEPEND_TASK_CODE_C, "today", "day")).collect(Collectors.toList())); /* - * OR AND 2-A-day-today 3-B-day-today - * OR 2-A-day-today 3-C-day-today + * OR AND 2-A-day-today 3-B-day-today OR 2-A-day-today 3-C-day-today */ DependentParameters dependentParameters = new DependentParameters(); dependentParameters.setRelation(DependentRelation.OR); dependentParameters.setDependTaskList(Stream.of( dependentTaskModel1, - dependentTaskModel2 - ).collect(Collectors.toList())); + dependentTaskModel2).collect(Collectors.toList())); TaskNode taskNode = getDependantTaskNode(); taskNode.setDependence(JSONUtils.toJsonString(dependentParameters)); setupTaskInstance(taskNode); ProcessInstance processInstance200 = - getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.FAILURE); + getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.FAILURE); ProcessInstance processInstance300 = - getProcessInstanceForFindLastRunningProcess(300, ExecutionStatus.SUCCESS); + getProcessInstanceForFindLastRunningProcess(300, WorkflowExecutionStatus.SUCCESS); // for DependentExecute.findLastProcessInterval Mockito.when(processService @@ -229,18 +228,21 @@ public class DependentTaskTest { Mockito.when(processService .findValidTaskListByProcessId(200)) .thenReturn(Stream.of( - getTaskInstanceForValidTaskList(2000, ExecutionStatus.FAILURE, DEPEND_TASK_CODE_A, processInstance200) - ).collect(Collectors.toList())); + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.FAILURE, DEPEND_TASK_CODE_A, + processInstance200)) + .collect(Collectors.toList())); Mockito.when(processService .findValidTaskListByProcessId(300)) .thenReturn(Stream.of( - getTaskInstanceForValidTaskList(3000, ExecutionStatus.SUCCESS, DEPEND_TASK_CODE_B, processInstance300), - getTaskInstanceForValidTaskList(3001, ExecutionStatus.SUCCESS, DEPEND_TASK_CODE_C, processInstance300) - ).collect(Collectors.toList())); + getTaskInstanceForValidTaskList(3000, TaskExecutionStatus.SUCCESS, DEPEND_TASK_CODE_B, + processInstance300), + getTaskInstanceForValidTaskList(3001, TaskExecutionStatus.SUCCESS, DEPEND_TASK_CODE_C, + processInstance300)) + .collect(Collectors.toList())); - //DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); + // DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); } /** @@ -251,8 +253,8 @@ public class DependentTaskTest { DependentTaskModel dependentTaskModel = new DependentTaskModel(); dependentTaskModel.setRelation(DependentRelation.AND); dependentTaskModel.setDependItemList(Stream.of( - getDependentItemFromTaskNode(2L, Constants.DEPENDENT_ALL_TASK_CODE, "today", "day") - ).collect(Collectors.toList())); + getDependentItemFromTaskNode(2L, Constants.DEPENDENT_ALL_TASK_CODE, "today", "day")) + .collect(Collectors.toList())); DependentParameters dependentParameters = new DependentParameters(); dependentParameters.setRelation(DependentRelation.AND); @@ -270,11 +272,11 @@ public class DependentTaskTest { // for DependentExecute.findLastProcessInterval Mockito.when(processService .findLastRunningProcess(Mockito.eq(2L), Mockito.any(), Mockito.any())) - .thenReturn(getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.SUCCESS)); + .thenReturn(getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.SUCCESS)); - //DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); + // DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); } @Test @@ -283,11 +285,11 @@ public class DependentTaskTest { // for DependentExecute.findLastProcessInterval Mockito.when(processService .findLastRunningProcess(Mockito.eq(2L), Mockito.any(), Mockito.any())) - .thenReturn(getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.FAILURE)); + .thenReturn(getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.FAILURE)); - //DependentTaskExecThread dependentTask = new DependentTaskExecThread(taskInstance); - //dependentTask.call(); - //Assert.assertEquals(ExecutionStatus.FAILURE, dependentTask.getTaskInstance().getState()); + // DependentTaskExecThread dependentTask = new DependentTaskExecThread(taskInstance); + // dependentTask.call(); + // Assert.assertEquals(ExecutionStatus.FAILURE, dependentTask.getTaskInstance().getState()); } /** @@ -304,8 +306,7 @@ public class DependentTaskTest { DependentTaskModel dependentTaskModel = new DependentTaskModel(); dependentTaskModel.setRelation(DependentRelation.AND); dependentTaskModel.setDependItemList(Stream.of( - getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day") - ).collect(Collectors.toList())); + getDependentItemFromTaskNode(2L, DEPEND_TASK_CODE_A, "today", "day")).collect(Collectors.toList())); DependentParameters dependentParameters = new DependentParameters(); dependentParameters.setRelation(DependentRelation.AND); @@ -317,33 +318,34 @@ public class DependentTaskTest { setupTaskInstance(taskNode); ProcessInstance dependentProcessInstance = - getProcessInstanceForFindLastRunningProcess(200, ExecutionStatus.RUNNING_EXECUTION); + getProcessInstanceForFindLastRunningProcess(200, WorkflowExecutionStatus.RUNNING_EXECUTION); // for DependentExecute.findLastProcessInterval Mockito.when(processService .findLastRunningProcess(Mockito.eq(2L), Mockito.any(), Mockito.any())) .thenReturn(dependentProcessInstance); - //DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); + // DependentTaskExecThread taskExecThread = new DependentTaskExecThread(taskInstance); // for DependentExecute.getDependTaskResult Mockito.when(processService .findValidTaskListByProcessId(200)) .thenAnswer(i -> { - processInstance.setState(ExecutionStatus.READY_STOP); + processInstance.setState(WorkflowExecutionStatus.READY_STOP); return Stream.of( - getTaskInstanceForValidTaskList(2000, ExecutionStatus.RUNNING_EXECUTION, DEPEND_TASK_CODE_A, dependentProcessInstance) - ).collect(Collectors.toList()); + getTaskInstanceForValidTaskList(2000, TaskExecutionStatus.RUNNING_EXECUTION, + DEPEND_TASK_CODE_A, dependentProcessInstance)) + .collect(Collectors.toList()); }) .thenThrow(new IllegalStateException("have not been stopped as expected")); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.KILL, taskExecThread.getTaskInstance().getState()); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.KILL, taskExecThread.getTaskInstance().getState()); } private ProcessInstance getProcessInstance() { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(100); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); return processInstance; } @@ -382,7 +384,7 @@ public class DependentTaskTest { taskInstance.setTaskCode(TASK_CODE); taskInstance.setTaskDefinitionVersion(TASK_VERSION); taskInstance.setProcessInstanceId(processInstance.getId()); - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); taskInstance.setTaskType(taskNode.getType().toUpperCase()); taskInstance.setDependency(JSONUtils.parseObject(taskNode.getDependence(), DependentParameters.class)); taskInstance.setName(taskNode.getName()); @@ -391,7 +393,8 @@ public class DependentTaskTest { /** * DependentItem defines the condition for the dependent */ - private DependentItem getDependentItemFromTaskNode(Long processDefinitionCode, long taskCode, String date, String cycle) { + private DependentItem getDependentItemFromTaskNode(Long processDefinitionCode, long taskCode, String date, + String cycle) { DependentItem dependentItem = new DependentItem(); dependentItem.setDefinitionCode(processDefinitionCode); dependentItem.setDepTaskCode(taskCode); @@ -399,11 +402,12 @@ public class DependentTaskTest { dependentItem.setCycle(cycle); // so far, the following fields have no effect dependentItem.setDependResult(DependResult.SUCCESS); - dependentItem.setStatus(ExecutionStatus.SUCCESS); + dependentItem.setStatus(TaskExecutionStatus.SUCCESS); return dependentItem; } - private ProcessInstance getProcessInstanceForFindLastRunningProcess(int processInstanceId, ExecutionStatus state) { + private ProcessInstance getProcessInstanceForFindLastRunningProcess(int processInstanceId, + WorkflowExecutionStatus state) { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(processInstanceId); processInstance.setState(state); @@ -411,9 +415,8 @@ public class DependentTaskTest { } private TaskInstance getTaskInstanceForValidTaskList( - int taskInstanceId, ExecutionStatus state, - long taskCode, ProcessInstance processInstance - ) { + int taskInstanceId, TaskExecutionStatus state, + long taskCode, ProcessInstance processInstance) { TaskInstance taskInstance = new TaskInstance(); taskInstance.setTaskType("DEPENDENT"); taskInstance.setId(taskInstanceId); diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SubProcessTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SubProcessTaskTest.java index fa51a2d6be..9b4fe3be54 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SubProcessTaskTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SubProcessTaskTest.java @@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.server.master; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.thread.Stopper; import org.apache.dolphinscheduler.common.utils.JSONUtils; @@ -26,7 +27,7 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.server.master.config.MasterConfig; @@ -85,17 +86,17 @@ public class SubProcessTaskTest { TaskInstance taskInstance = getTaskInstance(); Mockito.when(processService - .findProcessInstanceById(processInstance.getId())) + .findProcessInstanceById(processInstance.getId())) .thenReturn(processInstance); // for SubProcessTaskExecThread.setTaskInstanceState Mockito.when(processService - .updateTaskInstance(Mockito.any())) + .updateTaskInstance(Mockito.any())) .thenReturn(true); // for MasterBaseTaskExecThread.submit Mockito.when(processService - .submitTask(processInstance, taskInstance)) + .submitTask(processInstance, taskInstance)) .thenAnswer(t -> t.getArgument(0)); TaskDefinition taskDefinition = new TaskDefinition(); @@ -106,17 +107,17 @@ public class SubProcessTaskTest { .thenReturn(taskDefinition); } - private TaskInstance testBasicInit(ExecutionStatus expectResult) { + private TaskInstance testBasicInit(WorkflowExecutionStatus expectResult) { TaskInstance taskInstance = getTaskInstance(getTaskNode(), processInstance); ProcessInstance subProcessInstance = getSubProcessInstance(expectResult); subProcessInstance.setVarPool(getProperty()); // for SubProcessTaskExecThread.waitTaskQuit Mockito.when(processService - .findProcessInstanceById(subProcessInstance.getId())) + .findProcessInstanceById(subProcessInstance.getId())) .thenReturn(subProcessInstance); Mockito.when(processService - .findSubProcessInstance(processInstance.getId(), taskInstance.getId())) + .findSubProcessInstance(processInstance.getId(), taskInstance.getId())) .thenReturn(subProcessInstance); return taskInstance; @@ -124,15 +125,15 @@ public class SubProcessTaskTest { @Test public void testBasicSuccess() { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.SUCCESS); - //SubProcessTaskExecThread taskExecThread = new SubProcessTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); + TaskInstance taskInstance = testBasicInit(WorkflowExecutionStatus.SUCCESS); + // SubProcessTaskExecThread taskExecThread = new SubProcessTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); } @Test public void testFinish() { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.SUCCESS); + TaskInstance taskInstance = testBasicInit(WorkflowExecutionStatus.SUCCESS); taskInstance.setVarPool(getProperty()); taskInstance.setTaskParams("{\"processDefinitionCode\":110," + "\"dependence\":{},\"localParams\":[{\"prop\":\"key\"," + @@ -144,8 +145,8 @@ public class SubProcessTaskTest { SubTaskProcessor subTaskProcessor = new SubTaskProcessor(); subTaskProcessor.init(taskInstance, processInstance); subTaskProcessor.action(TaskAction.RUN); - ExecutionStatus status = taskInstance.getState(); - Assert.assertEquals(ExecutionStatus.SUCCESS, status); + TaskExecutionStatus status = taskInstance.getState(); + Assert.assertEquals(TaskExecutionStatus.SUCCESS, status); } private String getProperty() { @@ -160,10 +161,10 @@ public class SubProcessTaskTest { @Test public void testBasicFailure() { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.FAILURE); - //SubProcessTaskExecThread taskExecThread = new SubProcessTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.FAILURE, taskExecThread.getTaskInstance().getState()); + TaskInstance taskInstance = testBasicInit(WorkflowExecutionStatus.FAILURE); + // SubProcessTaskExecThread taskExecThread = new SubProcessTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.FAILURE, taskExecThread.getTaskInstance().getState()); } private TaskNode getTaskNode() { @@ -180,7 +181,7 @@ public class SubProcessTaskTest { private ProcessInstance getProcessInstance() { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(100); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setWarningGroupId(0); processInstance.setName("S"); return processInstance; @@ -192,7 +193,7 @@ public class SubProcessTaskTest { return taskInstance; } - private ProcessInstance getSubProcessInstance(ExecutionStatus executionStatus) { + private ProcessInstance getSubProcessInstance(WorkflowExecutionStatus executionStatus) { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(102); processInstance.setState(executionStatus); @@ -210,7 +211,7 @@ public class SubProcessTaskTest { taskInstance.setTaskDefinitionVersion(taskNode.getVersion()); taskInstance.setTaskType(taskNode.getType().toUpperCase()); taskInstance.setProcessInstanceId(processInstance.getId()); - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); return taskInstance; } } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java index 6f94a22e2f..5b22ec5481 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java @@ -18,13 +18,14 @@ package org.apache.dolphinscheduler.server.master; import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo; import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters; import org.apache.dolphinscheduler.server.master.config.MasterConfig; @@ -71,7 +72,7 @@ public class SwitchTaskTest { .thenReturn(processInstance); } - private TaskInstance testBasicInit(ExecutionStatus expectResult) { + private TaskInstance testBasicInit(WorkflowExecutionStatus expectResult) { TaskDefinition taskDefinition = new TaskDefinition(); taskDefinition.setTimeoutFlag(TimeoutFlag.OPEN); taskDefinition.setTimeoutNotifyStrategy(TaskTimeoutStrategy.WARN); @@ -102,11 +103,11 @@ public class SwitchTaskTest { @Test public void testExe() throws Exception { - TaskInstance taskInstance = testBasicInit(ExecutionStatus.SUCCESS); - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); - //SwitchTaskExecThread taskExecThread = new SwitchTaskExecThread(taskInstance); - //taskExecThread.call(); - //Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); + TaskInstance taskInstance = testBasicInit(WorkflowExecutionStatus.SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); + // SwitchTaskExecThread taskExecThread = new SwitchTaskExecThread(taskInstance); + // taskExecThread.call(); + // Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecThread.getTaskInstance().getState()); } private SwitchParameters getTaskNode() { @@ -135,7 +136,7 @@ public class SwitchTaskTest { private ProcessInstance getProcessInstance() { ProcessInstance processInstance = new ProcessInstance(); processInstance.setId(1000); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setProcessDefinitionCode(1L); return processInstance; } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java index 05590e4541..23cf9ed915 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java @@ -27,7 +27,7 @@ import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.entity.Tenant; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.server.master.dispatch.ExecutorDispatcher; import org.apache.dolphinscheduler.service.process.ProcessService; import org.apache.dolphinscheduler.service.queue.TaskPriority; @@ -83,7 +83,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("default"); taskInstance.setExecutorId(2); @@ -112,7 +112,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SQL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("default"); taskInstance.setExecutorId(2); @@ -153,7 +153,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("DATAX"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("default"); taskInstance.setExecutorId(2); @@ -192,7 +192,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SQOOP"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("default"); taskInstance.setExecutorId(2); @@ -231,7 +231,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("default"); taskInstance.setExecutorId(2); @@ -248,7 +248,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("NoWorkGroup"); taskInstance.setExecutorId(2); @@ -258,7 +258,7 @@ public class TaskPriorityQueueConsumerTest { processInstance.setTenantId(1); processInstance.setCommandType(CommandType.START_PROCESS); taskInstance.setProcessInstance(processInstance); - taskInstance.setState(ExecutionStatus.DELAY_EXECUTION); + taskInstance.setState(TaskExecutionStatus.DELAY_EXECUTION); ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.setUserId(2); @@ -281,7 +281,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("NoWorkGroup"); taskInstance.setExecutorId(2); @@ -291,7 +291,7 @@ public class TaskPriorityQueueConsumerTest { processInstance.setTenantId(1); processInstance.setCommandType(CommandType.START_PROCESS); taskInstance.setProcessInstance(processInstance); - taskInstance.setState(ExecutionStatus.DELAY_EXECUTION); + taskInstance.setState(TaskExecutionStatus.DELAY_EXECUTION); ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.setUserId(2); @@ -317,7 +317,7 @@ public class TaskPriorityQueueConsumerTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("NoWorkGroup"); taskInstance.setExecutorId(2); @@ -327,7 +327,7 @@ public class TaskPriorityQueueConsumerTest { processInstance.setTenantId(1); processInstance.setCommandType(CommandType.START_PROCESS); taskInstance.setProcessInstance(processInstance); - taskInstance.setState(ExecutionStatus.DELAY_EXECUTION); + taskInstance.setState(TaskExecutionStatus.DELAY_EXECUTION); ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.setUserId(2); diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java index 0f3d1431da..225e41aeba 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java @@ -17,7 +17,7 @@ package org.apache.dolphinscheduler.server.master.processor; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningCommand; import org.apache.dolphinscheduler.server.master.processor.queue.TaskEvent; import org.apache.dolphinscheduler.server.master.processor.queue.TaskEventService; @@ -65,9 +65,9 @@ public class TaskAckProcessorTest { taskResponseEvent = PowerMockito.mock(TaskEvent.class); taskExecuteRunningMessage = new TaskExecuteRunningCommand("127.0.0.1:5678", - " 127.0.0.1:1234", - System.currentTimeMillis()); - taskExecuteRunningMessage.setStatus(ExecutionStatus.RUNNING_EXECUTION); + " 127.0.0.1:1234", + System.currentTimeMillis()); + taskExecuteRunningMessage.setStatus(TaskExecutionStatus.RUNNING_EXECUTION); taskExecuteRunningMessage.setExecutePath("/dolphinscheduler/worker"); taskExecuteRunningMessage.setHost("localhost"); taskExecuteRunningMessage.setLogPath("/temp/worker.log"); @@ -78,17 +78,18 @@ public class TaskAckProcessorTest { @Test public void testProcess() { -// Command command = taskExecuteAckCommand.convert2Command(); -// Assert.assertEquals(CommandType.TASK_EXECUTE_ACK,command.getType()); -// InetSocketAddress socketAddress = new InetSocketAddress("localhost",12345); -// PowerMockito.when(channel.remoteAddress()).thenReturn(socketAddress); -// PowerMockito.mockStatic(TaskResponseEvent.class); -// -// PowerMockito.when(TaskResponseEvent.newAck(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyInt(), channel)) -// .thenReturn(taskResponseEvent); -// TaskInstance taskInstance = PowerMockito.mock(TaskInstance.class); -// PowerMockito.when(processService.findTaskInstanceById(Mockito.any())).thenReturn(taskInstance); -// -// taskAckProcessor.process(channel,command); + // Command command = taskExecuteAckCommand.convert2Command(); + // Assert.assertEquals(CommandType.TASK_EXECUTE_ACK,command.getType()); + // InetSocketAddress socketAddress = new InetSocketAddress("localhost",12345); + // PowerMockito.when(channel.remoteAddress()).thenReturn(socketAddress); + // PowerMockito.mockStatic(TaskResponseEvent.class); + // + // PowerMockito.when(TaskResponseEvent.newAck(Mockito.any(), Mockito.any(), Mockito.anyString(), + // Mockito.anyString(), Mockito.anyString(), Mockito.anyInt(), channel)) + // .thenReturn(taskResponseEvent); + // TaskInstance taskInstance = PowerMockito.mock(TaskInstance.class); + // PowerMockito.when(processService.findTaskInstanceById(Mockito.any())).thenReturn(taskInstance); + // + // taskAckProcessor.process(channel,command); } } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java index 50c1231348..2e17302693 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskKillResponseProcessorTest.java @@ -17,7 +17,7 @@ package org.apache.dolphinscheduler.server.master.processor; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskKillResponseCommand; @@ -48,10 +48,15 @@ public class TaskKillResponseProcessorTest { channel = PowerMockito.mock(Channel.class); taskKillResponseCommand = new TaskKillResponseCommand(); taskKillResponseCommand.setAppIds( - new ArrayList() {{ add("task_1"); }}); + new ArrayList() { + + { + add("task_1"); + } + }); taskKillResponseCommand.setHost("localhost"); taskKillResponseCommand.setProcessId(1); - taskKillResponseCommand.setStatus(ExecutionStatus.RUNNING_EXECUTION); + taskKillResponseCommand.setStatus(TaskExecutionStatus.RUNNING_EXECUTION); taskKillResponseCommand.setTaskInstanceId(1); } @@ -59,7 +64,7 @@ public class TaskKillResponseProcessorTest { @Test public void testProcess() { Command command = taskKillResponseCommand.convert2Command(); - Assert.assertEquals(CommandType.TASK_KILL_RESPONSE,command.getType()); - taskKillResponseProcessor.process(channel,command); + Assert.assertEquals(CommandType.TASK_KILL_RESPONSE, command.getType()); + taskKillResponseProcessor.process(channel, command); } } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java index 5df4d918b4..37b147fe25 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/queue/TaskResponseServiceTest.java @@ -19,7 +19,7 @@ package org.apache.dolphinscheduler.server.master.processor.queue; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.TaskExecuteResultCommand; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningCommand; import org.apache.dolphinscheduler.server.master.cache.impl.ProcessInstanceExecCacheManagerImpl; @@ -74,37 +74,37 @@ public class TaskResponseServiceTest { taskEventService.start(); TaskExecuteRunningCommand taskExecuteRunningMessage = new TaskExecuteRunningCommand("127.0.0.1:5678", - "127.0.0.1:1234", - System.currentTimeMillis()); + "127.0.0.1:1234", + System.currentTimeMillis()); taskExecuteRunningMessage.setProcessId(1); taskExecuteRunningMessage.setTaskInstanceId(22); - taskExecuteRunningMessage.setStatus(ExecutionStatus.RUNNING_EXECUTION); + taskExecuteRunningMessage.setStatus(TaskExecutionStatus.RUNNING_EXECUTION); taskExecuteRunningMessage.setExecutePath("path"); taskExecuteRunningMessage.setLogPath("logPath"); taskExecuteRunningMessage.setHost("127.*.*.*"); taskExecuteRunningMessage.setStartTime(new Date()); ackEvent = TaskEvent.newRunningEvent(taskExecuteRunningMessage, - channel, - taskExecuteRunningMessage.getMessageSenderAddress()); + channel, + taskExecuteRunningMessage.getMessageSenderAddress()); TaskExecuteResultCommand taskExecuteResultMessage = new TaskExecuteResultCommand(NetUtils.getAddr(1234), - NetUtils.getAddr(5678), - System.currentTimeMillis()); + NetUtils.getAddr(5678), + System.currentTimeMillis()); taskExecuteResultMessage.setProcessInstanceId(1); taskExecuteResultMessage.setTaskInstanceId(22); - taskExecuteResultMessage.setStatus(ExecutionStatus.SUCCESS.getCode()); + taskExecuteResultMessage.setStatus(TaskExecutionStatus.SUCCESS.getCode()); taskExecuteResultMessage.setEndTime(new Date()); taskExecuteResultMessage.setVarPool("varPol"); taskExecuteResultMessage.setAppIds("ids"); taskExecuteResultMessage.setProcessId(1); resultEvent = TaskEvent.newResultEvent(taskExecuteResultMessage, - channel, - taskExecuteResultMessage.getMessageSenderAddress()); + channel, + taskExecuteResultMessage.getMessageSenderAddress()); taskInstance = new TaskInstance(); taskInstance.setId(22); - taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + taskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); } @Test diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java index fb258cb267..b9cb32ff55 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java @@ -17,11 +17,11 @@ package org.apache.dolphinscheduler.server.master.runner; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; import org.apache.dolphinscheduler.service.process.ProcessService; @@ -41,7 +41,6 @@ import org.springframework.context.ApplicationContext; @Ignore public class MasterTaskExecThreadTest { - private SpringApplicationContext springApplicationContext; @Before @@ -49,9 +48,9 @@ public class MasterTaskExecThreadTest { ApplicationContext applicationContext = PowerMockito.mock(ApplicationContext.class); this.springApplicationContext = new SpringApplicationContext(); springApplicationContext.setApplicationContext(applicationContext); - // this.registryCenter = PowerMockito.mock(RegistryCenter.class); - //PowerMockito.when(SpringApplicationContext.getBean(RegistryCenter.class)) - // .thenReturn(this.registryCenter); + // this.registryCenter = PowerMockito.mock(RegistryCenter.class); + // PowerMockito.when(SpringApplicationContext.getBean(RegistryCenter.class)) + // .thenReturn(this.registryCenter); ProcessService processService = Mockito.mock(ProcessService.class); Mockito.when(SpringApplicationContext.getBean(ProcessService.class)) .thenReturn(processService); @@ -61,15 +60,16 @@ public class MasterTaskExecThreadTest { taskDefinition.setTimeout(0); Mockito.when(processService.findTaskDefinition(1L, 1)) .thenReturn(taskDefinition); - //this.masterTaskExecThread = new MasterTaskExecThread(getTaskInstance()); + // this.masterTaskExecThread = new MasterTaskExecThread(getTaskInstance()); } @Test public void testExistsValidWorkerGroup1() { - /* Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(Sets.newHashSet()); - boolean b = masterTaskExecThread.existsValidWorkerGroup("default"); - Assert.assertFalse(b);*/ + /* + * Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(Sets.newHashSet()); boolean b = + * masterTaskExecThread.existsValidWorkerGroup("default"); Assert.assertFalse(b); + */ } @Test @@ -78,19 +78,21 @@ public class MasterTaskExecThreadTest { workerGroups.add("test1"); workerGroups.add("test2"); - /* Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(workerGroups); - boolean b = masterTaskExecThread.existsValidWorkerGroup("default"); - Assert.assertFalse(b);*/ + /* + * Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(workerGroups); boolean b = + * masterTaskExecThread.existsValidWorkerGroup("default"); Assert.assertFalse(b); + */ } @Test public void testExistsValidWorkerGroup3() { Set workerGroups = new HashSet<>(); workerGroups.add("test1"); - /* Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(workerGroups); - Mockito.when(registryCenter.getWorkerGroupNodesDirectly("test1")).thenReturn(workerGroups); - boolean b = masterTaskExecThread.existsValidWorkerGroup("test1"); - Assert.assertTrue(b);*/ + /* + * Mockito.when(registryCenter.getWorkerGroupDirectly()).thenReturn(workerGroups); + * Mockito.when(registryCenter.getWorkerGroupNodesDirectly("test1")).thenReturn(workerGroups); boolean b = + * masterTaskExecThread.existsValidWorkerGroup("test1"); Assert.assertTrue(b); + */ } @Test @@ -113,9 +115,9 @@ public class MasterTaskExecThreadTest { Mockito.when(processService.findTaskDefinition(1L, 1)) .thenReturn(taskDefinition); - //MasterTaskExecThread masterTaskExecThread = new MasterTaskExecThread(taskInstance); - //masterTaskExecThread.pauseTask(); - //org.junit.Assert.assertEquals(ExecutionStatus.PAUSE, taskInstance.getState()); + // MasterTaskExecThread masterTaskExecThread = new MasterTaskExecThread(taskInstance); + // masterTaskExecThread.pauseTask(); + // org.junit.Assert.assertEquals(ExecutionStatus.PAUSE, taskInstance.getState()); } private TaskInstance getTaskInstance() { @@ -124,7 +126,7 @@ public class MasterTaskExecThreadTest { taskInstance.setId(252612); taskInstance.setName("C"); taskInstance.setProcessInstanceId(10111); - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); taskInstance.setTaskCode(1L); taskInstance.setTaskDefinitionVersion(1); return taskInstance; diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnableTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnableTest.java index 51064bc514..41a590bdfa 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnableTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnableTest.java @@ -27,6 +27,7 @@ import static org.powermock.api.mockito.PowerMockito.mock; import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.ProcessExecutionTypeEnum; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.service.expand.CuringParamsService; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.utils.DateUtils; @@ -35,7 +36,6 @@ import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.Schedule; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.server.master.config.MasterConfig; import org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager; import org.apache.dolphinscheduler.service.alert.ProcessAlertManager; @@ -102,7 +102,7 @@ public class WorkflowExecuteRunnableTest { Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService); processInstance = mock(ProcessInstance.class); - Mockito.when(processInstance.getState()).thenReturn(ExecutionStatus.SUCCESS); + Mockito.when(processInstance.getState()).thenReturn(WorkflowExecutionStatus.SUCCESS); Mockito.when(processInstance.getHistoryCmd()).thenReturn(CommandType.COMPLEMENT_DATA.toString()); Mockito.when(processInstance.getIsSubProcess()).thenReturn(Flag.NO); Mockito.when(processInstance.getScheduleTime()).thenReturn(DateUtils.stringToDate("2020-01-01 00:00:00")); @@ -120,7 +120,8 @@ public class WorkflowExecuteRunnableTest { NettyExecutorManager nettyExecutorManager = mock(NettyExecutorManager.class); ProcessAlertManager processAlertManager = mock(ProcessAlertManager.class); workflowExecuteThread = - PowerMockito.spy(new WorkflowExecuteRunnable(processInstance, processService, nettyExecutorManager, processAlertManager, config, stateWheelExecuteThread, curingGlobalParamsService)); + PowerMockito.spy(new WorkflowExecuteRunnable(processInstance, processService, nettyExecutorManager, + processAlertManager, config, stateWheelExecuteThread, curingGlobalParamsService)); // prepareProcess init dag Field dag = WorkflowExecuteRunnable.class.getDeclaredField("dag"); dag.setAccessible(true); @@ -137,7 +138,8 @@ public class WorkflowExecuteRunnableTest { Class masterExecThreadClass = WorkflowExecuteRunnable.class; Method method = masterExecThreadClass.getDeclaredMethod("parseStartNodeName", String.class); method.setAccessible(true); - List nodeNames = (List) method.invoke(workflowExecuteThread, JSONUtils.toJsonString(cmdParam)); + List nodeNames = + (List) method.invoke(workflowExecuteThread, JSONUtils.toJsonString(cmdParam)); Assert.assertEquals(3, nodeNames.size()); } catch (Exception e) { Assert.fail(); @@ -158,16 +160,19 @@ public class WorkflowExecuteRunnableTest { Map cmdParam = new HashMap<>(); cmdParam.put(CMD_PARAM_RECOVERY_START_NODE_STRING, "1,2,3,4"); Mockito.when(processService.findTaskInstanceByIdList( - Arrays.asList(taskInstance1.getId(), taskInstance2.getId(), taskInstance3.getId(), taskInstance4.getId())) - ).thenReturn(Arrays.asList(taskInstance1, taskInstance2, taskInstance3, taskInstance4)); + Arrays.asList(taskInstance1.getId(), taskInstance2.getId(), taskInstance3.getId(), + taskInstance4.getId()))) + .thenReturn(Arrays.asList(taskInstance1, taskInstance2, taskInstance3, taskInstance4)); Class masterExecThreadClass = WorkflowExecuteRunnable.class; Method method = masterExecThreadClass.getDeclaredMethod("getRecoverTaskInstanceList", String.class); method.setAccessible(true); - List taskInstances = workflowExecuteThread.getRecoverTaskInstanceList(JSONUtils.toJsonString(cmdParam)); + List taskInstances = + workflowExecuteThread.getRecoverTaskInstanceList(JSONUtils.toJsonString(cmdParam)); Assert.assertEquals(4, taskInstances.size()); cmdParam.put(CMD_PARAM_RECOVERY_START_NODE_STRING, "1"); - List taskInstanceEmpty = (List) method.invoke(workflowExecuteThread, JSONUtils.toJsonString(cmdParam)); + List taskInstanceEmpty = + (List) method.invoke(workflowExecuteThread, JSONUtils.toJsonString(cmdParam)); Assert.assertTrue(taskInstanceEmpty.isEmpty()); } catch (Exception e) { @@ -252,7 +257,7 @@ public class WorkflowExecuteRunnableTest { processInstance9.setId(222); processInstance9.setProcessDefinitionCode(11L); processInstance9.setProcessDefinitionVersion(1); - processInstance9.setState(ExecutionStatus.SERIAL_WAIT); + processInstance9.setState(WorkflowExecutionStatus.SERIAL_WAIT); Mockito.when(processService.findProcessInstanceById(225)).thenReturn(processInstance); Mockito.when(processService.findProcessInstanceById(222)).thenReturn(processInstance9); diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessorTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessorTest.java index 136d26365d..b45a65456d 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessorTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessorTest.java @@ -27,7 +27,7 @@ import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.entity.Tenant; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.service.process.ProcessService; import org.apache.dolphinscheduler.spi.enums.ResourceType; @@ -61,7 +61,7 @@ public class CommonTaskProcessorTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("NoWorkGroup"); taskInstance.setExecutorId(2); @@ -71,7 +71,7 @@ public class CommonTaskProcessorTest { processInstance.setTenantId(1); processInstance.setCommandType(CommandType.START_PROCESS); taskInstance.setProcessInstance(processInstance); - taskInstance.setState(ExecutionStatus.DELAY_EXECUTION); + taskInstance.setState(TaskExecutionStatus.DELAY_EXECUTION); ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.setUserId(2); @@ -94,7 +94,7 @@ public class CommonTaskProcessorTest { taskInstance.setId(1); taskInstance.setTaskType("SHELL"); taskInstance.setProcessInstanceId(1); - taskInstance.setState(ExecutionStatus.KILL); + taskInstance.setState(TaskExecutionStatus.KILL); taskInstance.setProcessInstancePriority(Priority.MEDIUM); taskInstance.setWorkerGroup("NoWorkGroup"); taskInstance.setExecutorId(2); @@ -108,7 +108,8 @@ public class CommonTaskProcessorTest { resourcesList.add(resource); Mockito.doReturn(resourcesList).when(processService).listResourceByIds(new Integer[]{123}); - Mockito.doReturn("tenantCode").when(processService).queryTenantCodeByResName(resource.getFullName(), ResourceType.FILE); + Mockito.doReturn("tenantCode").when(processService).queryTenantCodeByResName(resource.getFullName(), + ResourceType.FILE); Assert.assertNotNull(map); } diff --git a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java index ab71cd75cd..fcebc196e0 100644 --- a/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java +++ b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/service/FailoverServiceTest.java @@ -30,7 +30,7 @@ import org.apache.dolphinscheduler.common.model.Server; import org.apache.dolphinscheduler.common.utils.NetUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.server.master.cache.ProcessInstanceExecCacheManager; import org.apache.dolphinscheduler.server.master.config.MasterConfig; import org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager; @@ -55,7 +55,6 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.springframework.context.ApplicationContext; -import org.springframework.test.util.ReflectionTestUtils; import com.google.common.collect.Lists; @@ -66,6 +65,7 @@ import com.google.common.collect.Lists; @PrepareForTest({RegistryClient.class}) @PowerMockIgnore({"javax.management.*"}) public class FailoverServiceTest { + private FailoverService failoverService; @Mock @@ -104,12 +104,12 @@ public class FailoverServiceTest { given(masterConfig.getListenPort()).willReturn(masterPort); MasterFailoverService masterFailoverService = - new MasterFailoverService(registryClient, masterConfig, processService, nettyExecutorManager); + new MasterFailoverService(registryClient, masterConfig, processService, nettyExecutorManager); WorkerFailoverService workerFailoverService = new WorkerFailoverService(registryClient, - masterConfig, - processService, - workflowExecuteThreadPool, - cacheManager); + masterConfig, + processService, + workflowExecuteThreadPool, + cacheManager); failoverService = new FailoverService(masterFailoverService, workerFailoverService); @@ -126,7 +126,8 @@ public class FailoverServiceTest { given(registryClient.getStoppable()).willReturn(cause -> { }); given(registryClient.checkNodeExists(Mockito.anyString(), Mockito.any())).willReturn(true); - doNothing().when(registryClient).handleDeadServer(Mockito.anySet(), Mockito.any(NodeType.class), Mockito.anyString()); + doNothing().when(registryClient).handleDeadServer(Mockito.anySet(), Mockito.any(NodeType.class), + Mockito.anyString()); processInstance = new ProcessInstance(); processInstance.setId(1); @@ -148,11 +149,14 @@ public class FailoverServiceTest { workerTaskInstance.setHost(testWorkerHost); workerTaskInstance.setTaskType(COMMON_TASK_TYPE); - given(processService.queryNeedFailoverTaskInstances(Mockito.anyString())).willReturn(Arrays.asList(masterTaskInstance, workerTaskInstance)); + given(processService.queryNeedFailoverTaskInstances(Mockito.anyString())) + .willReturn(Arrays.asList(masterTaskInstance, workerTaskInstance)); given(processService.queryNeedFailoverProcessInstanceHost()).willReturn(Lists.newArrayList(testMasterHost)); - given(processService.queryNeedFailoverProcessInstances(Mockito.anyString())).willReturn(Arrays.asList(processInstance)); + given(processService.queryNeedFailoverProcessInstances(Mockito.anyString())) + .willReturn(Arrays.asList(processInstance)); doNothing().when(processService).processNeedFailoverProcessInstances(Mockito.any(ProcessInstance.class)); - given(processService.findValidTaskListByProcessId(Mockito.anyInt())).willReturn(Lists.newArrayList(masterTaskInstance, workerTaskInstance)); + given(processService.findValidTaskListByProcessId(Mockito.anyInt())) + .willReturn(Lists.newArrayList(masterTaskInstance, workerTaskInstance)); given(processService.findProcessInstanceDetailById(Mockito.anyInt())).willReturn(processInstance); Thread.sleep(1000); @@ -175,26 +179,26 @@ public class FailoverServiceTest { @Test public void failoverMasterTest() { processInstance.setHost(Constants.NULL); - masterTaskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + masterTaskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); failoverService.failoverServerWhenDown(testMasterHost, NodeType.MASTER); - Assert.assertNotEquals(masterTaskInstance.getState(), ExecutionStatus.NEED_FAULT_TOLERANCE); + Assert.assertNotEquals(masterTaskInstance.getState(), TaskExecutionStatus.NEED_FAULT_TOLERANCE); processInstance.setHost(testMasterHost); - masterTaskInstance.setState(ExecutionStatus.SUCCESS); + masterTaskInstance.setState(TaskExecutionStatus.SUCCESS); failoverService.failoverServerWhenDown(testMasterHost, NodeType.MASTER); - Assert.assertNotEquals(masterTaskInstance.getState(), ExecutionStatus.NEED_FAULT_TOLERANCE); + Assert.assertNotEquals(masterTaskInstance.getState(), TaskExecutionStatus.NEED_FAULT_TOLERANCE); Assert.assertEquals(Constants.NULL, processInstance.getHost()); processInstance.setHost(testMasterHost); - masterTaskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + masterTaskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); failoverService.failoverServerWhenDown(testMasterHost, NodeType.MASTER); - Assert.assertEquals(masterTaskInstance.getState(), ExecutionStatus.NEED_FAULT_TOLERANCE); + Assert.assertEquals(masterTaskInstance.getState(), TaskExecutionStatus.NEED_FAULT_TOLERANCE); Assert.assertEquals(Constants.NULL, processInstance.getHost()); } @Test public void failoverWorkTest() { - workerTaskInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + workerTaskInstance.setState(TaskExecutionStatus.RUNNING_EXECUTION); WorkflowExecuteRunnable workflowExecuteRunnable = Mockito.mock(WorkflowExecuteRunnable.class); Mockito.when(workflowExecuteRunnable.getAllTaskInstances()).thenReturn(Lists.newArrayList(workerTaskInstance)); Mockito.when(workflowExecuteRunnable.getProcessInstance()).thenReturn(processInstance); @@ -202,8 +206,7 @@ public class FailoverServiceTest { Mockito.when(cacheManager.getAll()).thenReturn(Lists.newArrayList(workflowExecuteRunnable)); Mockito.when(cacheManager.getByProcessInstanceId(Mockito.anyInt())).thenReturn(workflowExecuteRunnable); - failoverService.failoverServerWhenDown(testWorkerHost, NodeType.WORKER); - Assert.assertEquals(ExecutionStatus.NEED_FAULT_TOLERANCE, workerTaskInstance.getState()); + Assert.assertEquals(TaskExecutionStatus.NEED_FAULT_TOLERANCE, workerTaskInstance.getState()); } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/HostUpdateCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/HostUpdateCommand.java index d060a8e0f5..f265b758b4 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/HostUpdateCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/HostUpdateCommand.java @@ -17,6 +17,7 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.Data; import org.apache.dolphinscheduler.common.utils.JSONUtils; import java.io.Serializable; @@ -24,28 +25,13 @@ import java.io.Serializable; /** * process host update */ +@Data public class HostUpdateCommand implements Serializable { private int taskInstanceId; private String processHost; - public int getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(int taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - - public String getProcessHost() { - return processHost; - } - - public void setProcessHost(String processHost) { - this.processHost = processHost; - } - /** * package request command * @@ -59,11 +45,4 @@ public class HostUpdateCommand implements Serializable { return command; } - @Override - public String toString() { - return "HostUpdateCommand{" - + "taskInstanceId=" + taskInstanceId - + "host=" + processHost - + '}'; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventResponseCommand.java index c080ce94f1..b98e5dad0b 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventResponseCommand.java @@ -17,43 +17,20 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.AllArgsConstructor; +import lombok.Data; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.io.Serializable; /** * db task final result response command */ +@Data +@AllArgsConstructor public class StateEventResponseCommand implements Serializable { private String key; - private ExecutionStatus status; - - public StateEventResponseCommand() { - super(); - } - - public StateEventResponseCommand(ExecutionStatus status, String key) { - this.status = status; - this.key = key; - } - - public ExecutionStatus getStatus() { - return status; - } - - public void setStatus(ExecutionStatus status) { - this.status = status; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } /** * package response command @@ -68,12 +45,4 @@ public class StateEventResponseCommand implements Serializable { return command; } - @Override - public String toString() { - return "StateEventResponseCommand{" - + "key=" + key - + ", status=" + status - + '}'; - } - } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskEventChangeCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskEventChangeCommand.java index 1f1ea2c958..bf0ff595d6 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskEventChangeCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskEventChangeCommand.java @@ -17,6 +17,8 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import java.io.Serializable; @@ -24,6 +26,8 @@ import java.io.Serializable; /** * db task final result response command */ +@Data +@NoArgsConstructor public class TaskEventChangeCommand implements Serializable { private String key; @@ -32,14 +36,9 @@ public class TaskEventChangeCommand implements Serializable { private int taskInstanceId; - public TaskEventChangeCommand() { - super(); - } - public TaskEventChangeCommand( int processInstanceId, - int taskInstanceId - ) { + int taskInstanceId) { this.key = String.format("%d-%d", processInstanceId, taskInstanceId); @@ -48,14 +47,6 @@ public class TaskEventChangeCommand implements Serializable { this.taskInstanceId = taskInstanceId; } - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - /** * package response command * @@ -69,26 +60,4 @@ public class TaskEventChangeCommand implements Serializable { return command; } - @Override - public String toString() { - return "TaskEventChangeCommand{" - + "key=" + key - + '}'; - } - - public int getProcessInstanceId() { - return processInstanceId; - } - - public void setProcessInstanceId(int processInstanceId) { - this.processInstanceId = processInstanceId; - } - - public int getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(int taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java index b423fc6f91..4505031a23 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java @@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.remote.command; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,15 +35,15 @@ import lombok.ToString; public class TaskExecuteAckCommand extends BaseCommand { private int taskInstanceId; - private ExecutionStatus status; + private boolean success; - public TaskExecuteAckCommand(ExecutionStatus status, + public TaskExecuteAckCommand(boolean success, int taskInstanceId, String sourceServerAddress, String messageReceiverAddress, long messageSendTime) { super(sourceServerAddress, messageReceiverAddress, messageSendTime); - this.status = status; + this.success = success; this.taskInstanceId = taskInstanceId; } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningAckMessage.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningAckMessage.java index fbbe9190b5..ea0da08cff 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningAckMessage.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningAckMessage.java @@ -17,8 +17,11 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.io.Serializable; @@ -26,35 +29,14 @@ import java.io.Serializable; * task execute running ack command * from master to worker */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class TaskExecuteRunningAckMessage implements Serializable { + private boolean success; private int taskInstanceId; - private ExecutionStatus status; - - public TaskExecuteRunningAckMessage() { - super(); - } - - public TaskExecuteRunningAckMessage(ExecutionStatus status, int taskInstanceId) { - this.status = status; - this.taskInstanceId = taskInstanceId; - } - - public int getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(int taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - - public ExecutionStatus getStatus() { - return status; - } - - public void setStatus(ExecutionStatus status) { - this.status = status; - } /** * package response command @@ -69,8 +51,4 @@ public class TaskExecuteRunningAckMessage implements Serializable { return command; } - @Override - public String toString() { - return "TaskExecuteRunningAckCommand{" + "taskInstanceId=" + taskInstanceId + ", status=" + status + '}'; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningCommand.java index 3a0bcea227..3002d57ad4 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRunningCommand.java @@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.remote.command; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Date; @@ -26,6 +25,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; /** * Task running message, means the task is running in worker. @@ -59,7 +59,7 @@ public class TaskExecuteRunningCommand extends BaseCommand { /** * status */ - private ExecutionStatus status; + private TaskExecutionStatus status; /** * logPath diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java index 55ce7ebc84..ba7fad8368 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java @@ -17,8 +17,12 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import java.io.Serializable; import java.util.List; @@ -26,27 +30,18 @@ import java.util.List; /** * kill task response command */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class TaskKillResponseCommand implements Serializable { - /** - * taskInstanceId - */ private int taskInstanceId; - /** - * host - */ private String host; - /** - * status - */ - private ExecutionStatus status; + private TaskExecutionStatus status; - - /** - * processId - */ private int processId; /** @@ -54,46 +49,6 @@ public class TaskKillResponseCommand implements Serializable { */ private List appIds; - public int getTaskInstanceId() { - return taskInstanceId; - } - - public void setTaskInstanceId(int taskInstanceId) { - this.taskInstanceId = taskInstanceId; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - public ExecutionStatus getStatus() { - return status; - } - - public void setStatus(ExecutionStatus status) { - this.status = status; - } - - public int getProcessId() { - return processId; - } - - public void setProcessId(int processId) { - this.processId = processId; - } - - public List getAppIds() { - return appIds; - } - - public void setAppIds(List appIds) { - this.appIds = appIds; - } - /** * package request command * @@ -107,14 +62,4 @@ public class TaskKillResponseCommand implements Serializable { return command; } - @Override - public String toString() { - return "TaskKillResponseCommand{" - + "taskInstanceId=" + taskInstanceId - + ", host='" + host + '\'' - + ", status=" + status.getDescp() - + ", processId=" + processId - + ", appIds=" + appIds - + '}'; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskRejectAckCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskRejectAckCommand.java index f6f57e027f..9fe9edf492 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskRejectAckCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskRejectAckCommand.java @@ -18,7 +18,6 @@ package org.apache.dolphinscheduler.remote.command; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,15 +31,15 @@ import lombok.ToString; public class TaskRejectAckCommand extends BaseCommand { private int taskInstanceId; - private ExecutionStatus status; + private boolean success; - public TaskRejectAckCommand(ExecutionStatus status, + public TaskRejectAckCommand(boolean success, int taskInstanceId, String messageSenderAddress, String messageReceiverAddress, long messageSendTime) { super(messageSenderAddress, messageReceiverAddress, messageSendTime); - this.status = status; + this.success = success; this.taskInstanceId = taskInstanceId; } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatusTest.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskStateEventResponseCommand.java similarity index 54% rename from dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatusTest.java rename to dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskStateEventResponseCommand.java index 9b7dfa26b0..0a0ba0b012 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatusTest.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskStateEventResponseCommand.java @@ -15,18 +15,28 @@ * limitations under the License. */ -package org.apache.dolphinscheduler.plugin.task.api.enums; +package org.apache.dolphinscheduler.remote.command; -import junit.framework.TestCase; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; -/** - * execution status test. - */ -public class ExecutionStatusTest extends TestCase { +import java.io.Serializable; - public void testTypeIsRunning() { - assertTrue(ExecutionStatus.RUNNING_EXECUTION.typeIsRunning()); - assertTrue(ExecutionStatus.WAITING_DEPEND.typeIsRunning()); - assertTrue(ExecutionStatus.DELAY_EXECUTION.typeIsRunning()); +public class TaskStateEventResponseCommand implements Serializable { + + private TaskExecutionStatus status; + private String key; + + /** + * package response command + * + * @return command + */ + public Command convert2Command() { + Command command = new Command(); + command.setType(CommandType.TASK_EXECUTE_RESULT_ACK); + byte[] body = JSONUtils.toJsonByteArray(this); + command.setBody(body); + return command; } -} \ No newline at end of file +} diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventChangeCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/WorkflowStateEventChangeCommand.java similarity index 51% rename from dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventChangeCommand.java rename to dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/WorkflowStateEventChangeCommand.java index 1e7461b8ab..0b45c48215 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventChangeCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/WorkflowStateEventChangeCommand.java @@ -17,19 +17,21 @@ package org.apache.dolphinscheduler.remote.command; +import lombok.Data; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.io.Serializable; /** * db task final result response command */ -public class StateEventChangeCommand implements Serializable { +@Data +public class WorkflowStateEventChangeCommand implements Serializable { private String key; - private ExecutionStatus sourceStatus; + private WorkflowExecutionStatus sourceStatus; private int sourceProcessInstanceId; @@ -39,15 +41,11 @@ public class StateEventChangeCommand implements Serializable { private int destTaskInstanceId; - public StateEventChangeCommand() { - super(); - } - - public StateEventChangeCommand(int sourceProcessInstanceId, int sourceTaskInstanceId, - ExecutionStatus sourceStatus, - int destProcessInstanceId, - int destTaskInstanceId - ) { + public WorkflowStateEventChangeCommand(int sourceProcessInstanceId, + int sourceTaskInstanceId, + WorkflowExecutionStatus sourceStatus, + int destProcessInstanceId, + int destTaskInstanceId) { this.key = String.format("%d-%d-%d-%d", sourceProcessInstanceId, sourceTaskInstanceId, @@ -61,14 +59,6 @@ public class StateEventChangeCommand implements Serializable { this.destTaskInstanceId = destTaskInstanceId; } - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - /** * package response command * @@ -82,50 +72,4 @@ public class StateEventChangeCommand implements Serializable { return command; } - @Override - public String toString() { - return "StateEventResponseCommand{" - + "key=" + key - + '}'; - } - - public ExecutionStatus getSourceStatus() { - return sourceStatus; - } - - public void setSourceStatus(ExecutionStatus sourceStatus) { - this.sourceStatus = sourceStatus; - } - - public int getSourceProcessInstanceId() { - return sourceProcessInstanceId; - } - - public void setSourceProcessInstanceId(int sourceProcessInstanceId) { - this.sourceProcessInstanceId = sourceProcessInstanceId; - } - - public int getSourceTaskInstanceId() { - return sourceTaskInstanceId; - } - - public void setSourceTaskInstanceId(int sourceTaskInstanceId) { - this.sourceTaskInstanceId = sourceTaskInstanceId; - } - - public int getDestProcessInstanceId() { - return destProcessInstanceId; - } - - public void setDestProcessInstanceId(int destProcessInstanceId) { - this.destProcessInstanceId = destProcessInstanceId; - } - - public int getDestTaskInstanceId() { - return destTaskInstanceId; - } - - public void setDestTaskInstanceId(int destTaskInstanceId) { - this.destTaskInstanceId = destTaskInstanceId; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java index 83c81c9fbe..2acf46d253 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendRequestCommand.java @@ -17,12 +17,18 @@ package org.apache.dolphinscheduler.remote.command.alert; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.utils.JsonSerializer; import java.io.Serializable; +@Data +@NoArgsConstructor +@AllArgsConstructor public class AlertSendRequestCommand implements Serializable { private int groupId; @@ -33,49 +39,6 @@ public class AlertSendRequestCommand implements Serializable { private int warnType; - public int getGroupId() { - return groupId; - } - - public void setGroupId(int groupId) { - this.groupId = groupId; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public int getWarnType() { - return warnType; - } - - public void setWarnType(int warnType) { - this.warnType = warnType; - } - - public AlertSendRequestCommand(){ - - } - - public AlertSendRequestCommand(int groupId, String title, String content, int warnType) { - this.groupId = groupId; - this.title = title; - this.content = content; - this.warnType = warnType; - } - /** * package request command * @@ -88,14 +51,4 @@ public class AlertSendRequestCommand implements Serializable { command.setBody(body); return command; } - - @Override - public String toString() { - return "AlertSendRequestCommand{" + - "groupId=" + groupId + - ", title='" + title + '\'' + - ", content='" + content + '\'' + - ", warnType=" + warnType + - '}'; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java index 984cc43c94..9c5e62781b 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.alert; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.utils.JsonSerializer; @@ -24,41 +27,19 @@ import org.apache.dolphinscheduler.remote.utils.JsonSerializer; import java.io.Serializable; import java.util.List; +@Data +@NoArgsConstructor +@AllArgsConstructor public class AlertSendResponseCommand implements Serializable { /** * true:All alert are successful, * false:As long as one alert fails */ - private boolean resStatus; + private boolean success; private List resResults; - public boolean getResStatus() { - return resStatus; - } - - public void setResStatus(boolean resStatus) { - this.resStatus = resStatus; - } - - public List getResResults() { - return resResults; - } - - public void setResResults(List resResults) { - this.resResults = resResults; - } - - public AlertSendResponseCommand() { - - } - - public AlertSendResponseCommand(boolean resStatus, List resResults) { - this.resStatus = resStatus; - this.resResults = resResults; - } - /** * package response command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java index 1263b83a73..c0867ee7ae 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseResult.java @@ -17,36 +17,19 @@ package org.apache.dolphinscheduler.remote.command.alert; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; +@Data +@NoArgsConstructor +@AllArgsConstructor public class AlertSendResponseResult implements Serializable { - private boolean status; + private boolean success; private String message; - public boolean getStatus() { - return status; - } - - public void setStatus(boolean status) { - this.status = status; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public AlertSendResponseResult() { - - } - - public AlertSendResponseResult(boolean status, String message) { - this.status = status; - this.message = message; - } } diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommand.java index ef71e07cde..0022706e99 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * get log bytes request command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class GetLogBytesRequestCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class GetLogBytesRequestCommand implements Serializable { */ private String path; - public GetLogBytesRequestCommand() { - } - - public GetLogBytesRequestCommand(String path) { - this.path = path; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - /** * package request command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommand.java index e8e3eb2a10..30072e3151 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * get log bytes response command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class GetLogBytesResponseCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class GetLogBytesResponseCommand implements Serializable { */ private byte[] data; - public GetLogBytesResponseCommand() { - } - - public GetLogBytesResponseCommand(byte[] data) { - this.data = data; - } - - public byte[] getData() { - return data; - } - - public void setData(byte[] data) { - this.data = data; - } - /** * package response command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogRequestCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogRequestCommand.java index c5960d69f2..93efc25318 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogRequestCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogRequestCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * remove task log request command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class RemoveTaskLogRequestCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class RemoveTaskLogRequestCommand implements Serializable { */ private String path; - public RemoveTaskLogRequestCommand() { - } - - public RemoveTaskLogRequestCommand(String path) { - this.path = path; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - /** * package request command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogResponseCommand.java index 6883ece815..431a52066d 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RemoveTaskLogResponseCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,28 +29,16 @@ import java.io.Serializable; /** * remove task log request command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class RemoveTaskLogResponseCommand implements Serializable { - /*TaskPriorityQueueConsumer.* - * log path + /* + * TaskPriorityQueueConsumer.* log path */ private Boolean status; - public RemoveTaskLogResponseCommand() { - } - - public RemoveTaskLogResponseCommand(Boolean status) { - this.status = status; - } - - public Boolean getStatus() { - return status; - } - - public void setStatus(Boolean status) { - this.status = status; - } - /** * package request command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogRequestCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogRequestCommand.java index 4afee09e6d..4d11836f45 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogRequestCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogRequestCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * roll view log request command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class RollViewLogRequestCommand implements Serializable { /** @@ -43,39 +49,6 @@ public class RollViewLogRequestCommand implements Serializable { */ private int limit; - public RollViewLogRequestCommand() { - } - - public RollViewLogRequestCommand(String path, int skipLineNum, int limit) { - this.path = path; - this.skipLineNum = skipLineNum; - this.limit = limit; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - - public int getSkipLineNum() { - return skipLineNum; - } - - public void setSkipLineNum(int skipLineNum) { - this.skipLineNum = skipLineNum; - } - - public int getLimit() { - return limit; - } - - public void setLimit(int limit) { - this.limit = limit; - } - /** * package request command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogResponseCommand.java index 0e9e44a87b..4fea16d912 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/RollViewLogResponseCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * roll view log response command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class RollViewLogResponseCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class RollViewLogResponseCommand implements Serializable { */ private String msg; - public RollViewLogResponseCommand() { - } - - public RollViewLogResponseCommand(String msg) { - this.msg = msg; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - /** * package response command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogRequestCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogRequestCommand.java index e8094690dd..6eae191128 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogRequestCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogRequestCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * view log request command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ViewLogRequestCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class ViewLogRequestCommand implements Serializable { */ private String path; - public ViewLogRequestCommand() { - } - - public ViewLogRequestCommand(String path) { - this.path = path; - } - - public String getPath() { - return path; - } - - public void setPath(String path) { - this.path = path; - } - /** * package request command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogResponseCommand.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogResponseCommand.java index 33e263087c..52a1b17410 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogResponseCommand.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/log/ViewLogResponseCommand.java @@ -17,6 +17,9 @@ package org.apache.dolphinscheduler.remote.command.log; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; @@ -26,6 +29,9 @@ import java.io.Serializable; /** * view log response command */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class ViewLogResponseCommand implements Serializable { /** @@ -33,21 +39,6 @@ public class ViewLogResponseCommand implements Serializable { */ private String msg; - public ViewLogResponseCommand() { - } - - public ViewLogResponseCommand(String msg) { - this.msg = msg; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - /** * package response command * diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/TaskInstanceExecuteDto.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/TaskInstanceExecuteDto.java index 4bfae1036d..d674195125 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/TaskInstanceExecuteDto.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/TaskInstanceExecuteDto.java @@ -19,12 +19,12 @@ package org.apache.dolphinscheduler.remote.dto; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.Priority; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.Date; import java.util.Map; import lombok.Data; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; @Data public class TaskInstanceExecuteDto { @@ -45,7 +45,7 @@ public class TaskInstanceExecuteDto { private int taskGroupPriority; - private ExecutionStatus state; + private TaskExecutionStatus state; private Date firstSubmitTime; diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/WorkflowExecuteDto.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/WorkflowExecuteDto.java index 64d5542b94..3eac76da7a 100644 --- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/WorkflowExecuteDto.java +++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/dto/WorkflowExecuteDto.java @@ -17,13 +17,7 @@ package org.apache.dolphinscheduler.remote.dto; -import org.apache.dolphinscheduler.common.enums.CommandType; -import org.apache.dolphinscheduler.common.enums.FailureStrategy; -import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.common.enums.Priority; -import org.apache.dolphinscheduler.common.enums.TaskDependType; -import org.apache.dolphinscheduler.common.enums.WarningType; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.*; import java.util.Collection; import java.util.Date; @@ -43,7 +37,7 @@ public class WorkflowExecuteDto { private int processDefinitionVersion; - private ExecutionStatus state; + private WorkflowExecutionStatus state; /** * recovery flag for failover diff --git a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java index 41265a5339..044200466f 100644 --- a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java +++ b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/alert/AlertSendResponseCommandTest.java @@ -31,18 +31,18 @@ public class AlertSendResponseCommandTest { @Test public void testConvert2Command() { AlertSendResponseCommand alertSendResponseCommand = new AlertSendResponseCommand(); - alertSendResponseCommand.setResStatus(false); + alertSendResponseCommand.setSuccess(false); List responseResults = new ArrayList<>(); AlertSendResponseResult responseResult1 = new AlertSendResponseResult(); - responseResult1.setStatus(false); + responseResult1.setSuccess(false); responseResult1.setMessage("fail"); responseResults.add(responseResult1); - AlertSendResponseResult responseResult2 = new AlertSendResponseResult(true,"success"); + AlertSendResponseResult responseResult2 = new AlertSendResponseResult(true, "success"); responseResults.add(responseResult2); alertSendResponseCommand.setResResults(responseResults); Command command = alertSendResponseCommand.convert2Command(1); - Assert.assertEquals(CommandType.ALERT_SEND_RESPONSE,command.getType()); + Assert.assertEquals(CommandType.ALERT_SEND_RESPONSE, command.getType()); } } diff --git a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommandTest.java b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommandTest.java index 378ed1d980..6997a591ab 100644 --- a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommandTest.java +++ b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesRequestCommandTest.java @@ -28,8 +28,7 @@ public class GetLogBytesRequestCommandTest { @Test public void testConvert2Command() { - GetLogBytesRequestCommand getLogBytesRequestCommand = new GetLogBytesRequestCommand(); - getLogBytesRequestCommand.setPath("/opt/test"); + GetLogBytesRequestCommand getLogBytesRequestCommand = new GetLogBytesRequestCommand("/opt/test"); Command command = getLogBytesRequestCommand.convert2Command(); Assert.assertEquals(CommandType.GET_LOG_BYTES_REQUEST, command.getType()); } diff --git a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommandTest.java b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommandTest.java index 8e835da1d4..d48d607526 100644 --- a/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommandTest.java +++ b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/command/log/GetLogBytesResponseCommandTest.java @@ -29,8 +29,7 @@ public class GetLogBytesResponseCommandTest { @Test public void testConvert2Command() { - GetLogBytesResponseCommand getLogBytesResponseCommand = new GetLogBytesResponseCommand(); - getLogBytesResponseCommand.setData(data); + GetLogBytesResponseCommand getLogBytesResponseCommand = new GetLogBytesResponseCommand(data); Command command = getLogBytesResponseCommand.convert2Command(122); Assert.assertNotNull(command); } diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java index 125b2d82db..36888fef45 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java @@ -25,7 +25,7 @@ import org.apache.dolphinscheduler.common.utils.LoggerUtils; import org.apache.dolphinscheduler.common.utils.OSUtils; import org.apache.dolphinscheduler.common.utils.PropertyUtils; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.service.log.LogClientService; @@ -50,6 +50,7 @@ import lombok.NonNull; * mainly used to get the start command line of a process. */ public class ProcessUtils { + private static final Logger logger = LoggerFactory.getLogger(ProcessUtils.class); /** @@ -78,9 +79,9 @@ public class ProcessUtils { for (String appId : appIds) { try { - ExecutionStatus applicationStatus = HadoopUtils.getInstance().getApplicationStatus(appId); + TaskExecutionStatus applicationStatus = HadoopUtils.getInstance().getApplicationStatus(appId); - if (!applicationStatus.typeIsFinished()) { + if (!applicationStatus.isFinished()) { String commandFile = String.format("%s/%s.kill", executePath, appId); String cmd = getKerberosInitCommand() + "yarn application -kill " + appId; execYarnKillCommand(logger, tenantCode, appId, commandFile, cmd); @@ -97,12 +98,15 @@ public class ProcessUtils { static String getKerberosInitCommand() { logger.info("get kerberos init command"); StringBuilder kerberosCommandBuilder = new StringBuilder(); - boolean hadoopKerberosState = PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false); + boolean hadoopKerberosState = + PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false); if (hadoopKerberosState) { kerberosCommandBuilder.append("export KRB5_CONFIG=") .append(PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)) .append("\n\n") - .append(String.format("kinit -k -t %s %s || true", PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH), PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME))) + .append(String.format("kinit -k -t %s %s || true", + PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH), + PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME))) .append("\n\n"); logger.info("kerberos init command: {}", kerberosCommandBuilder); } @@ -118,7 +122,8 @@ public class ProcessUtils { * @param commandFile command file * @param cmd cmd */ - private static void execYarnKillCommand(Logger logger, String tenantCode, String appId, String commandFile, String cmd) { + private static void execYarnKillCommand(Logger logger, String tenantCode, String appId, String commandFile, + String cmd) { try { StringBuilder sb = new StringBuilder(); sb.append("#!/bin/sh\n"); @@ -133,7 +138,8 @@ public class ProcessUtils { File f = new File(commandFile); if (!f.exists()) { - org.apache.commons.io.FileUtils.writeStringToFile(new File(commandFile), sb.toString(), StandardCharsets.UTF_8); + org.apache.commons.io.FileUtils.writeStringToFile(new File(commandFile), sb.toString(), + StandardCharsets.UTF_8); } String runCmd = String.format("%s %s", Constants.SH, commandFile); @@ -197,16 +203,18 @@ public class ProcessUtils { } if (!StringUtils.isEmpty(log)) { if (StringUtils.isEmpty(taskExecutionContext.getExecutePath())) { - taskExecutionContext.setExecutePath(FileUtils.getProcessExecDir(taskExecutionContext.getProjectCode(), - taskExecutionContext.getProcessDefineCode(), - taskExecutionContext.getProcessDefineVersion(), - taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId())); + taskExecutionContext + .setExecutePath(FileUtils.getProcessExecDir(taskExecutionContext.getProjectCode(), + taskExecutionContext.getProcessDefineCode(), + taskExecutionContext.getProcessDefineVersion(), + taskExecutionContext.getProcessInstanceId(), + taskExecutionContext.getTaskInstanceId())); } FileUtils.createWorkDirIfAbsent(taskExecutionContext.getExecutePath()); List appIds = LoggerUtils.getAppIds(log, logger); if (CollectionUtils.isNotEmpty(appIds)) { - cancelApplication(appIds, logger, taskExecutionContext.getTenantCode(), taskExecutionContext.getExecutePath()); + cancelApplication(appIds, logger, taskExecutionContext.getTenantCode(), + taskExecutionContext.getExecutePath()); return appIds; } } diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java index d3ed3ce959..232f4dbaf2 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/ProcessUtilsTest.java @@ -23,11 +23,11 @@ import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.utils.HadoopUtils; import org.apache.dolphinscheduler.common.utils.OSUtils; import org.apache.dolphinscheduler.common.utils.PropertyUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.ArrayList; import java.util.List; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -64,12 +64,14 @@ public class ProcessUtilsTest { @Test public void testGetKerberosInitCommand() { PowerMockito.mockStatic(PropertyUtils.class); - PowerMockito.when(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE,false)).thenReturn(true); + PowerMockito.when(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) + .thenReturn(true); PowerMockito.when(PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)).thenReturn("/etc/krb5.conf"); PowerMockito.when(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH)).thenReturn("/etc/krb5.keytab"); PowerMockito.when(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME)).thenReturn("test@DS.COM"); Assert.assertNotEquals("", ProcessUtils.getKerberosInitCommand()); - PowerMockito.when(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE,false)).thenReturn(false); + PowerMockito.when(PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) + .thenReturn(false); Assert.assertEquals("", ProcessUtils.getKerberosInitCommand()); } @@ -80,7 +82,7 @@ public class ProcessUtilsTest { appIds.add("application_1598885606600_3677"); String tenantCode = "dev"; String executePath = "/ds-exec/1/1/1"; - ExecutionStatus running = ExecutionStatus.RUNNING_EXECUTION; + TaskExecutionStatus running = TaskExecutionStatus.RUNNING_EXECUTION; PowerMockito.mockStatic(HadoopUtils.class); HadoopUtils hadoop = HadoopUtils.getInstance(); diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java index 9296aebe27..ab8b162c08 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java @@ -106,9 +106,9 @@ public class ProcessAlertManager { ProjectUser projectUser) { String res = ""; - if (processInstance.getState().typeIsSuccess()) { + if (processInstance.getState().isSuccess()) { List successTaskList = new ArrayList<>(1); - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .projectCode(projectUser.getProjectCode()) .projectName(projectUser.getProjectName()) .owner(projectUser.getUserName()) @@ -125,14 +125,14 @@ public class ProcessAlertManager { .build(); successTaskList.add(processAlertContent); res = JSONUtils.toJsonString(successTaskList); - } else if (processInstance.getState().typeIsFailure()) { + } else if (processInstance.getState().isFailure()) { List failedTaskList = new ArrayList<>(); for (TaskInstance task : taskInstances) { - if (task.getState().typeIsSuccess()) { + if (task.getState().isSuccess()) { continue; } - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .projectCode(projectUser.getProjectCode()) .projectName(projectUser.getProjectName()) .owner(projectUser.getUserName()) @@ -168,7 +168,7 @@ public class ProcessAlertManager { List toleranceTaskInstanceList = new ArrayList<>(); for (TaskInstance taskInstance : toleranceTaskList) { - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .processId(processInstance.getId()) .processDefinitionCode(processInstance.getProcessDefinitionCode()) .processName(processInstance.getName()) @@ -196,7 +196,8 @@ public class ProcessAlertManager { alert.setContent(content); alert.setWarningType(WarningType.FAILURE); alert.setCreateTime(new Date()); - alert.setAlertGroupId(processInstance.getWarningGroupId() == null ? 1 : processInstance.getWarningGroupId()); + alert.setAlertGroupId( + processInstance.getWarningGroupId() == null ? 1 : processInstance.getWarningGroupId()); alert.setAlertType(AlertType.FAULT_TOLERANCE_WARNING); alertDao.addAlert(alert); logger.info("add alert to db , alert : {}", alert); @@ -224,9 +225,9 @@ public class ProcessAlertManager { Alert alert = new Alert(); String cmdName = getCommandCnName(processInstance.getCommandType()); - String success = processInstance.getState().typeIsSuccess() ? "success" : "failed"; + String success = processInstance.getState().isSuccess() ? "success" : "failed"; alert.setTitle(cmdName + " " + success); - alert.setWarningType(processInstance.getState().typeIsSuccess() ? WarningType.SUCCESS : WarningType.FAILURE); + alert.setWarningType(processInstance.getState().isSuccess() ? WarningType.SUCCESS : WarningType.FAILURE); String content = getContentProcessInstance(processInstance, taskInstances, projectUser); alert.setContent(content); alert.setAlertGroupId(processInstance.getWarningGroupId()); @@ -234,7 +235,8 @@ public class ProcessAlertManager { alert.setProjectCode(projectUser.getProjectCode()); alert.setProcessDefinitionCode(processInstance.getProcessDefinitionCode()); alert.setProcessInstanceId(processInstance.getId()); - alert.setAlertType(processInstance.getState().typeIsSuccess() ? AlertType.PROCESS_INSTANCE_SUCCESS : AlertType.PROCESS_INSTANCE_FAILURE); + alert.setAlertType(processInstance.getState().isSuccess() ? AlertType.PROCESS_INSTANCE_SUCCESS + : AlertType.PROCESS_INSTANCE_FAILURE); alertDao.addAlert(alert); logger.info("add alert to db , alert: {}", alert); } @@ -253,17 +255,17 @@ public class ProcessAlertManager { WarningType warningType = processInstance.getWarningType(); switch (warningType) { case ALL: - if (processInstance.getState().typeIsFinished()) { + if (processInstance.getState().isFinished()) { sendWarning = true; } break; case SUCCESS: - if (processInstance.getState().typeIsSuccess()) { + if (processInstance.getState().isSuccess()) { sendWarning = true; } break; case FAILURE: - if (processInstance.getState().typeIsFailure()) { + if (processInstance.getState().isFailure()) { sendWarning = true; } break; @@ -319,8 +321,9 @@ public class ProcessAlertManager { alert.setProjectCode(result.getProjectCode()); alert.setProcessDefinitionCode(processInstance.getProcessDefinitionCode()); alert.setProcessInstanceId(processInstance.getId()); - //might need to change to data quality status - alert.setAlertType(processInstance.getState().typeIsSuccess() ? AlertType.PROCESS_INSTANCE_SUCCESS : AlertType.PROCESS_INSTANCE_FAILURE); + // might need to change to data quality status + alert.setAlertType(processInstance.getState().isSuccess() ? AlertType.PROCESS_INSTANCE_SUCCESS + : AlertType.PROCESS_INSTANCE_FAILURE); alertDao.addAlert(alert); logger.info("add alert to db , alert: {}", alert); } @@ -328,7 +331,7 @@ public class ProcessAlertManager { /** * send data quality task error alert */ - public void sendTaskErrorAlert(TaskInstance taskInstance,ProcessInstance processInstance) { + public void sendTaskErrorAlert(TaskInstance taskInstance, ProcessInstance processInstance) { Alert alert = new Alert(); alert.setTitle("Task [" + taskInstance.getName() + "] Failure Warning"); String content = getTaskAlterContent(taskInstance); @@ -380,7 +383,7 @@ public class ProcessAlertManager { */ public String getTaskAlterContent(TaskInstance taskInstance) { - TaskAlertContent content = TaskAlertContent.newBuilder() + TaskAlertContent content = TaskAlertContent.builder() .processInstanceName(taskInstance.getProcessInstanceName()) .processInstanceId(taskInstance.getProcessInstanceId()) .taskInstanceId(taskInstance.getId()) @@ -396,7 +399,8 @@ public class ProcessAlertManager { return JSONUtils.toJsonString(content); } - public void sendTaskTimeoutAlert(ProcessInstance processInstance, TaskInstance taskInstance, ProjectUser projectUser) { + public void sendTaskTimeoutAlert(ProcessInstance processInstance, TaskInstance taskInstance, + ProjectUser projectUser) { alertDao.sendTaskTimeoutAlert(processInstance, taskInstance, projectUser); } @@ -412,7 +416,7 @@ public class ProcessAlertManager { Alert alert = new Alert(); String cmdName = getCommandCnName(processInstance.getCommandType()); List blockingNodeList = new ArrayList<>(1); - ProcessAlertContent processAlertContent = ProcessAlertContent.newBuilder() + ProcessAlertContent processAlertContent = ProcessAlertContent.builder() .projectCode(projectUser.getProjectCode()) .projectName(projectUser.getProjectName()) .owner(projectUser.getUserName()) @@ -436,6 +440,6 @@ public class ProcessAlertManager { alert.setProcessInstanceId(processInstance.getId()); alert.setAlertType(AlertType.PROCESS_INSTANCE_BLOCKED); alertDao.addAlert(alert); - logger.info("add alert to db, alert: {}",alert); + logger.info("add alert to db, alert: {}", alert); } } diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java index 6c1cf5f962..b99a9ad325 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java @@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.service.process; import org.apache.dolphinscheduler.common.enums.AuthorizationType; import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; @@ -50,7 +51,7 @@ import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.entity.Tenant; import org.apache.dolphinscheduler.dao.entity.UdfFunc; import org.apache.dolphinscheduler.dao.entity.User; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval; import org.apache.dolphinscheduler.service.exceptions.CronParseException; import org.apache.dolphinscheduler.spi.enums.ResourceType; @@ -62,9 +63,10 @@ import java.util.Map; import org.springframework.transaction.annotation.Transactional; public interface ProcessService { + @Transactional - ProcessInstance handleCommand(String host, Command command) - throws CronParseException, CodeGenerateUtils.CodeGenerateException; + ProcessInstance handleCommand(String host, + Command command) throws CronParseException, CodeGenerateUtils.CodeGenerateException; void moveToErrorCommand(Command command, String message); @@ -106,7 +108,8 @@ public interface ProcessService { void setSubProcessParam(ProcessInstance subProcessInstance); - TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, long commitInterval); + TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, + long commitInterval); @Transactional TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance); @@ -122,7 +125,7 @@ public interface ProcessService { TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance); - ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance); + TaskExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance); void saveProcessInstance(ProcessInstance processInstance); @@ -142,7 +145,7 @@ public interface ProcessService { void updateTaskDefinitionResources(TaskDefinition taskDefinition); - List findTaskIdByInstanceState(int instanceId, ExecutionStatus state); + List findTaskIdByInstanceState(int instanceId, TaskExecutionStatus state); List findValidTaskListByProcessId(Integer processInstanceId); @@ -183,7 +186,7 @@ public interface ProcessService { DataSource findDataSourceById(int id); - int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus); + int updateProcessInstanceState(Integer processInstanceId, WorkflowExecutionStatus executionStatus); ProcessInstance findProcessInstanceByTaskId(int taskId); @@ -227,7 +230,8 @@ public interface ProcessService { int saveTaskDefine(User operator, long projectCode, List taskDefinitionLogs, Boolean syncDefine); - int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean syncDefine, Boolean isFromProcessDefine); + int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean syncDefine, + Boolean isFromProcessDefine); int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, int processDefinitionVersion, List taskRelationList, List taskDefinitionLogs, @@ -247,7 +251,8 @@ public interface ProcessService { List findRelationByCode(long processDefinitionCode, int processDefinitionVersion); - List transformTask(List taskRelationList, List taskDefinitionLogs); + List transformTask(List taskRelationList, + List taskDefinitionLogs); Map notifyProcessList(int processId); @@ -296,7 +301,7 @@ public interface ProcessService { ProcessInstance loadNextProcess4Serial(long code, int state, int id); - public String findConfigYamlByName(String clusterName) ; + public String findConfigYamlByName(String clusterName); void forceProcessInstanceSuccessByTaskInstanceId(Integer taskInstanceId); } diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java index 1d8628a8c0..94618cbb42 100644 --- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java +++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java @@ -34,15 +34,7 @@ import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConst import static java.util.stream.Collectors.toSet; import org.apache.dolphinscheduler.common.Constants; -import org.apache.dolphinscheduler.common.enums.AuthorizationType; -import org.apache.dolphinscheduler.common.enums.CommandType; -import org.apache.dolphinscheduler.common.enums.FailureStrategy; -import org.apache.dolphinscheduler.common.enums.Flag; -import org.apache.dolphinscheduler.common.enums.ReleaseState; -import org.apache.dolphinscheduler.common.enums.TaskDependType; -import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus; -import org.apache.dolphinscheduler.common.enums.TimeoutFlag; -import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.enums.*; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; @@ -115,7 +107,7 @@ import org.apache.dolphinscheduler.dao.mapper.WorkFlowLineageMapper; import org.apache.dolphinscheduler.dao.utils.DagHelper; import org.apache.dolphinscheduler.dao.utils.DqRuleUtils; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState; import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval; import org.apache.dolphinscheduler.plugin.task.api.model.Property; @@ -124,7 +116,7 @@ import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode; import org.apache.dolphinscheduler.plugin.task.api.parameters.SubProcessParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter; -import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; +import org.apache.dolphinscheduler.remote.command.WorkflowStateEventChangeCommand; import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService; import org.apache.dolphinscheduler.remote.utils.Host; @@ -250,7 +242,6 @@ public class ProcessServiceImpl implements ProcessService { @Autowired private ProcessTaskRelationLogMapper processTaskRelationLogMapper; - @Autowired StateEventCallbackService stateEventCallbackService; @@ -287,8 +278,8 @@ public class ProcessServiceImpl implements ProcessService { */ @Override @Transactional - public ProcessInstance handleCommand(String host, Command command) throws CronParseException, - CodeGenerateException { + public ProcessInstance handleCommand(String host, + Command command) throws CronParseException, CodeGenerateException { ProcessInstance processInstance = constructProcessInstance(command, host); // cannot construct process instance, return null if (processInstance == null) { @@ -298,11 +289,12 @@ public class ProcessServiceImpl implements ProcessService { } processInstance.setCommandType(command.getCommandType()); processInstance.addHistoryCmd(command.getCommandType()); - //if the processDefinition is serial - ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); + // if the processDefinition is serial + ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (processDefinition.getExecutionType().typeIsSerial()) { saveSerialProcess(processInstance, processDefinition); - if (processInstance.getState() != ExecutionStatus.SUBMITTED_SUCCESS) { + if (processInstance.getState() != WorkflowExecutionStatus.SUBMITTED_SUCCESS) { setSubProcessParam(processInstance); deleteCommandWithCheck(command.getId()); return null; @@ -316,51 +308,61 @@ public class ProcessServiceImpl implements ProcessService { } protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) { - processInstance.setState(ExecutionStatus.SERIAL_WAIT); + processInstance.setState(WorkflowExecutionStatus.SERIAL_WAIT); saveProcessInstance(processInstance); - //serial wait - //when we get the running instance(or waiting instance) only get the priority instance(by id) + // serial wait + // when we get the running instance(or waiting instance) only get the priority instance(by id) if (processDefinition.getExecutionType().typeIsSerialWait()) { - List runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); + List runningProcessInstances = + this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId( + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, + processInstance.getId()); if (CollectionUtils.isEmpty(runningProcessInstances)) { - processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUBMITTED_SUCCESS); saveProcessInstance(processInstance); } } else if (processDefinition.getExecutionType().typeIsSerialDiscard()) { - List runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); + List runningProcessInstances = + this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId( + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, + processInstance.getId()); if (CollectionUtils.isNotEmpty(runningProcessInstances)) { - processInstance.setState(ExecutionStatus.STOP); + processInstance.setState(WorkflowExecutionStatus.STOP); saveProcessInstance(processInstance); return; } - processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUBMITTED_SUCCESS); saveProcessInstance(processInstance); } else if (processDefinition.getExecutionType().typeIsSerialPriority()) { - List runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); + List runningProcessInstances = + this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId( + processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, + processInstance.getId()); if (CollectionUtils.isEmpty(runningProcessInstances)) { - processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUBMITTED_SUCCESS); saveProcessInstance(processInstance); return; } for (ProcessInstance info : runningProcessInstances) { - if (Objects.nonNull(info.getState()) && (ExecutionStatus.READY_STOP.equals(info.getState()) || info.getState().typeIsFinished())) { + if (Objects.nonNull(info.getState()) && (WorkflowExecutionStatus.READY_STOP.equals(info.getState()) + || info.getState().isFinished())) { continue; } info.setCommandType(CommandType.STOP); info.addHistoryCmd(CommandType.STOP); - info.setState(ExecutionStatus.READY_STOP); + info.setState(WorkflowExecutionStatus.READY_STOP); int update = updateProcessInstance(info); // determine whether the process is normal if (update > 0) { - StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand( - info.getId(), 0, info.getState(), info.getId(), 0 - ); + WorkflowStateEventChangeCommand workflowStateEventChangeCommand = + new WorkflowStateEventChangeCommand( + info.getId(), 0, info.getState(), info.getId(), 0); try { Host host = new Host(info.getHost()); - stateEventCallbackService.sendResult(host, stateEventChangeCommand.convert2Command()); + stateEventCallbackService.sendResult(host, workflowStateEventChangeCommand.convert2Command()); } catch (Exception e) { logger.error("sendResultError", e); } @@ -383,24 +385,6 @@ public class ProcessServiceImpl implements ProcessService { this.commandMapper.deleteById(command.getId()); } - /** - * set process waiting thread - * - * @param command command - * @param processInstance processInstance - * @return process instance - */ - private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) { - processInstance.setState(ExecutionStatus.WAITING_THREAD); - if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) { - processInstance.addHistoryCmd(command.getCommandType()); - } - saveProcessInstance(processInstance); - this.setSubProcessParam(processInstance); - createRecoveryWaitingThreadCommand(command, processInstance); - return null; - } - /** * insert one command * @@ -467,7 +451,8 @@ public class ProcessServiceImpl implements ProcessService { for (Command tmpCommand : commands) { if (cmdTypeMap.containsKey(tmpCommand.getCommandType())) { ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam()); - if (tempObj != null && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) { + if (tempObj != null + && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) { isNeedCreate = false; break; } @@ -498,11 +483,13 @@ public class ProcessServiceImpl implements ProcessService { logger.error("process define not exists"); return Lists.newArrayList(); } - List processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); + List processTaskRelations = processTaskRelationLogMapper + .queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); Set taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) { if (processTaskRelation.getPostTaskCode() > 0) { - taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); + taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), + processTaskRelation.getPostTaskVersion())); } } if (taskDefinitionSet.isEmpty()) { @@ -685,22 +672,21 @@ public class ProcessServiceImpl implements ProcessService { // process instance quit by "waiting thread" state if (originCommand == null) { Command command = new Command( - CommandType.RECOVER_WAITING_THREAD, - processInstance.getTaskDependType(), - processInstance.getFailureStrategy(), - processInstance.getExecutorId(), - processInstance.getProcessDefinition().getCode(), - JSONUtils.toJsonString(cmdParam), - processInstance.getWarningType(), - processInstance.getWarningGroupId(), - processInstance.getScheduleTime(), - processInstance.getWorkerGroup(), - processInstance.getEnvironmentCode(), - processInstance.getProcessInstancePriority(), - processInstance.getDryRun(), - processInstance.getId(), - processInstance.getProcessDefinitionVersion() - ); + CommandType.RECOVER_WAITING_THREAD, + processInstance.getTaskDependType(), + processInstance.getFailureStrategy(), + processInstance.getExecutorId(), + processInstance.getProcessDefinition().getCode(), + JSONUtils.toJsonString(cmdParam), + processInstance.getWarningType(), + processInstance.getWarningGroupId(), + processInstance.getScheduleTime(), + processInstance.getWorkerGroup(), + processInstance.getEnvironmentCode(), + processInstance.getProcessInstancePriority(), + processInstance.getDryRun(), + processInstance.getId(), + processInstance.getProcessDefinitionVersion()); saveCommand(command); return; } @@ -735,14 +721,14 @@ public class ProcessServiceImpl implements ProcessService { Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); List schedules = - queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode()); + queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode()); List complementDateList = CronUtils.getSelfFireDateList(start, end, schedules); if (complementDateList.size() > 0) { scheduleTime = complementDateList.get(0); } else { logger.error("set scheduler time error: complement date list is empty, command: {}", - command.toString()); + command.toString()); } } return scheduleTime; @@ -762,7 +748,7 @@ public class ProcessServiceImpl implements ProcessService { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.setProcessDefinitionCode(processDefinition.getCode()); processInstance.setProcessDefinitionVersion(processDefinition.getVersion()); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setRecovery(Flag.NO); processInstance.setStartTime(new Date()); // the new process instance restart time is null. @@ -798,17 +784,19 @@ public class ProcessServiceImpl implements ProcessService { } String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(), - processDefinition.getGlobalParamMap(), - processDefinition.getGlobalParamList(), - getCommandTypeIfComplement(processInstance, command), - processInstance.getScheduleTime(), timezoneId); + processDefinition.getGlobalParamMap(), + processDefinition.getGlobalParamList(), + getCommandTypeIfComplement(processInstance, command), + processInstance.getScheduleTime(), timezoneId); processInstance.setGlobalParams(globalParams); // set process instance priority processInstance.setProcessInstancePriority(command.getProcessInstancePriority()); - String workerGroup = Strings.isNullOrEmpty(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup(); + String workerGroup = Strings.isNullOrEmpty(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP + : command.getWorkerGroup(); processInstance.setWorkerGroup(workerGroup); - processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode()); + processInstance + .setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode()); processInstance.setTimeout(processDefinition.getTimeout()); processInstance.setTenantId(processDefinition.getTenantId()); return processInstance; @@ -831,14 +819,14 @@ public class ProcessServiceImpl implements ProcessService { Map globalMap = processDefinition.getGlobalParamMap(); List globalParamList = processDefinition.getGlobalParamList(); if (startParamMap.size() > 0 && globalMap != null) { - //start param to overwrite global param + // start param to overwrite global param for (Map.Entry param : globalMap.entrySet()) { String val = startParamMap.get(param.getKey()); if (val != null) { param.setValue(val); } } - //start param to create new global param if global not exist + // start param to create new global param if global not exist for (Entry startParam : startParamMap.entrySet()) { if (!globalMap.containsKey(startParam.getKey())) { globalMap.put(startParam.getKey(), startParam.getValue()); @@ -900,10 +888,11 @@ public class ProcessServiceImpl implements ProcessService { * @return whether command param is valid */ private Boolean checkCmdParam(Command command, Map cmdParam) { - if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) { + if (command.getTaskDependType() == TaskDependType.TASK_ONLY + || command.getTaskDependType() == TaskDependType.TASK_PRE) { if (cmdParam == null - || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES) - || cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) { + || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES) + || cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) { logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType()); return false; } @@ -918,14 +907,14 @@ public class ProcessServiceImpl implements ProcessService { * @param host host * @return process instance */ - protected ProcessInstance constructProcessInstance(Command command, String host) - throws CronParseException, CodeGenerateException { + protected ProcessInstance constructProcessInstance(Command command, + String host) throws CronParseException, CodeGenerateException { ProcessInstance processInstance; ProcessDefinition processDefinition; CommandType commandType = command.getCommandType(); processDefinition = - this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion()); + this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion()); if (processDefinition == null) { logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode()); throw new IllegalArgumentException("Cannot find the process definition for this workflowInstance"); @@ -952,14 +941,14 @@ public class ProcessServiceImpl implements ProcessService { // Recalculate global parameters after rerun. String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(), - processDefinition.getGlobalParamMap(), - processDefinition.getGlobalParamList(), - commandTypeIfComplement, - processInstance.getScheduleTime(), timezoneId); + processDefinition.getGlobalParamMap(), + processDefinition.getGlobalParamList(), + commandTypeIfComplement, + processInstance.getScheduleTime(), timezoneId); processInstance.setGlobalParams(globalParams); processInstance.setProcessDefinition(processDefinition); } - //reset command parameter + // reset command parameter if (processInstance.getCommandParam() != null) { Map processCmdParam = JSONUtils.toMap(processInstance.getCommandParam()); processCmdParam.forEach((key, value) -> { @@ -981,16 +970,19 @@ public class ProcessServiceImpl implements ProcessService { } processInstance.setHost(host); processInstance.setRestartTime(new Date()); - ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION; + WorkflowExecutionStatus runStatus = WorkflowExecutionStatus.RUNNING_EXECUTION; int runTime = processInstance.getRunTimes(); switch (commandType) { case START_PROCESS: break; case START_FAILURE_TASK_PROCESS: // find failed tasks and init these tasks - List failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE); - List toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE); - List killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL); + List failedList = + this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.FAILURE); + List toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), + TaskExecutionStatus.NEED_FAULT_TOLERANCE); + List killedList = + this.findTaskIdByInstanceState(processInstance.getId(), TaskExecutionStatus.KILL); cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); failedList.addAll(killedList); @@ -999,7 +991,7 @@ public class ProcessServiceImpl implements ProcessService { initTaskInstance(this.findTaskInstanceById(taskId)); } cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, - String.join(Constants.COMMA, convertIntListToString(failedList))); + String.join(Constants.COMMA, convertIntListToString(failedList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; @@ -1010,15 +1002,14 @@ public class ProcessServiceImpl implements ProcessService { case RECOVER_SUSPENDED_PROCESS: // find pause tasks and init task's state cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); - List suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE); List stopNodeList = findTaskIdByInstanceState(processInstance.getId(), - ExecutionStatus.KILL); - suspendedNodeList.addAll(stopNodeList); - for (Integer taskId : suspendedNodeList) { + TaskExecutionStatus.KILL); + for (Integer taskId : stopNodeList) { // initialize the pause state initTaskInstance(this.findTaskInstanceById(taskId)); } - cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList))); + cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, + String.join(",", convertIntListToString(stopNodeList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; @@ -1090,7 +1081,7 @@ public class ProcessServiceImpl implements ProcessService { } return processDefineLogMapper.queryByDefinitionCodeAndVersion( - processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); + processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); } } @@ -1131,7 +1122,7 @@ public class ProcessServiceImpl implements ProcessService { List complementDate = Lists.newLinkedList(); if (start != null && end != null) { List listSchedules = - queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode()); + queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode()); complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules); } if (cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) { @@ -1146,9 +1137,9 @@ public class ProcessServiceImpl implements ProcessService { String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE); String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(), - processDefinition.getGlobalParamMap(), - processDefinition.getGlobalParamList(), - CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime(), timezoneId); + processDefinition.getGlobalParamMap(), + processDefinition.getGlobalParamList(), + CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime(), timezoneId); processInstance.setGlobalParams(globalParams); } @@ -1168,7 +1159,7 @@ public class ProcessServiceImpl implements ProcessService { Map paramMap = JSONUtils.toMap(cmdParam); // write sub process id into cmd param. if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS) - && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) { + && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) { paramMap.remove(CMD_PARAM_SUB_PROCESS); paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId())); subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap)); @@ -1180,8 +1171,10 @@ public class ProcessServiceImpl implements ProcessService { if (!Strings.isNullOrEmpty(parentInstanceId)) { ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId)); if (parentInstance != null) { - subProcessInstance.setGlobalParams(joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams())); - subProcessInstance.setVarPool(joinVarPool(parentInstance.getVarPool(), subProcessInstance.getVarPool())); + subProcessInstance.setGlobalParams( + joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams())); + subProcessInstance + .setVarPool(joinVarPool(parentInstance.getVarPool(), subProcessInstance.getVarPool())); this.saveProcessInstance(subProcessInstance); } else { logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam); @@ -1216,10 +1209,10 @@ public class ProcessServiceImpl implements ProcessService { // We will combine the params of parent workflow and sub workflow // If the params are defined in both, we will use parent's params to override the sub workflow(ISSUE-7962) // todo: Do we need to consider the other attribute of Property? - // e.g. the subProp's type is not equals with parent, or subProp's direct is not equals with parent - // It's suggested to add node name in property, this kind of problem can be solved. + // e.g. the subProp's type is not equals with parent, or subProp's direct is not equals with parent + // It's suggested to add node name in property, this kind of problem can be solved. List extraSubParams = subParams.stream() - .filter(subProp -> !parentParamKeys.contains(subProp.getProp())).collect(Collectors.toList()); + .filter(subProp -> !parentParamKeys.contains(subProp.getProp())).collect(Collectors.toList()); parentParams.addAll(extraSubParams); return JSONUtils.toJsonString(parentParams); } @@ -1234,12 +1227,14 @@ public class ProcessServiceImpl implements ProcessService { */ private String joinVarPool(String parentValPool, String subValPool) { List parentValPools = Lists.newArrayList(JSONUtils.toList(parentValPool, Property.class)); - parentValPools = parentValPools.stream().filter(valPool -> valPool.getDirect() == Direct.OUT).collect(Collectors.toList()); + parentValPools = parentValPools.stream().filter(valPool -> valPool.getDirect() == Direct.OUT) + .collect(Collectors.toList()); List subValPools = Lists.newArrayList(JSONUtils.toList(subValPool, Property.class)); Set parentValPoolKeys = parentValPools.stream().map(Property::getProp).collect(toSet()); - List extraSubValPools = subValPools.stream().filter(sub -> !parentValPoolKeys.contains(sub.getProp())).collect(Collectors.toList()); + List extraSubValPools = subValPools.stream().filter(sub -> !parentValPoolKeys.contains(sub.getProp())) + .collect(Collectors.toList()); parentValPools.addAll(extraSubValPools); return JSONUtils.toJsonString(parentValPools); } @@ -1252,12 +1247,12 @@ public class ProcessServiceImpl implements ProcessService { private void initTaskInstance(TaskInstance taskInstance) { if (!taskInstance.isSubProcess() - && (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) { + && (taskInstance.getState().isKill() || taskInstance.getState().isFailure())) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); return; } - taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); + taskInstance.setState(TaskExecutionStatus.SUBMITTED_SUCCESS); updateTaskInstance(taskInstance); } @@ -1265,7 +1260,8 @@ public class ProcessServiceImpl implements ProcessService { * retry submit task to db */ @Override - public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, long commitInterval) { + public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, + int commitRetryTimes, long commitInterval) { int retryTimes = 1; TaskInstance task = null; while (retryTimes <= commitRetryTimes) { @@ -1277,9 +1273,9 @@ public class ProcessServiceImpl implements ProcessService { break; } logger.error( - "task commit to db failed , taskCode: {} has already retry {} times, please check the database", - taskInstance.getTaskCode(), - retryTimes); + "task commit to db failed , taskCode: {} has already retry {} times, please check the database", + taskInstance.getTaskCode(), + retryTimes); Thread.sleep(commitInterval); } catch (Exception e) { logger.error("task commit to db failed", e); @@ -1303,30 +1299,30 @@ public class ProcessServiceImpl implements ProcessService { @Transactional public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) { logger.info("Start save taskInstance to database : {}, processInstance id:{}, state: {}", - taskInstance.getName(), - taskInstance.getProcessInstanceId(), - processInstance.getState()); - //submit to db + taskInstance.getName(), + taskInstance.getProcessInstanceId(), + processInstance.getState()); + // submit to db TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance); if (task == null) { logger.error("Save taskInstance to db error, task name:{}, process id:{} state: {} ", - taskInstance.getName(), - taskInstance.getProcessInstance().getId(), - processInstance.getState()); + taskInstance.getName(), + taskInstance.getProcessInstance().getId(), + processInstance.getState()); return null; } - if (!task.getState().typeIsFinished()) { + if (!task.getState().isFinished()) { createSubWorkProcess(processInstance, task); } logger.info( - "End save taskInstance to db successfully:{}, taskInstanceName: {}, taskInstance state:{}, processInstanceId:{}, processInstanceState: {}", - task.getId(), - task.getName(), - task.getState(), - processInstance.getId(), - processInstance.getState()); + "End save taskInstance to db successfully:{}, taskInstanceName: {}, taskInstance state:{}, processInstanceId:{}, processInstanceState: {}", + task.getId(), + task.getName(), + task.getState(), + processInstance.getId(), + processInstance.getState()); return task; } @@ -1341,7 +1337,8 @@ public class ProcessServiceImpl implements ProcessService { * @param processMap processMap * @return process instance map */ - private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask, ProcessInstanceMap processMap) { + private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask, + ProcessInstanceMap processMap) { if (processMap != null) { return processMap; } @@ -1384,7 +1381,7 @@ public class ProcessServiceImpl implements ProcessService { } } logger.info("sub process instance is not found,parent task:{},parent instance:{}", - parentTask.getId(), parentProcessInstance.getId()); + parentTask.getId(), parentProcessInstance.getId()); return null; } @@ -1399,9 +1396,10 @@ public class ProcessServiceImpl implements ProcessService { if (!task.isSubProcess()) { return; } - //check create sub work flow firstly + // check create sub work flow firstly ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId()); - if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) { + if (null != instanceMap + && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) { // recover failover tolerance would not create a new command when the sub command already have been created return; } @@ -1410,8 +1408,8 @@ public class ProcessServiceImpl implements ProcessService { if (instanceMap.getProcessInstanceId() != 0) { childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId()); } - if (childInstance != null && childInstance.getState() == ExecutionStatus.SUCCESS - && CommandType.START_FAILURE_TASK_PROCESS == parentProcessInstance.getCommandType()) { + if (childInstance != null && childInstance.getState() == WorkflowExecutionStatus.SUCCESS + && CommandType.START_FAILURE_TASK_PROCESS == parentProcessInstance.getCommandType()) { logger.info("sub process instance {} status is success, so skip creating command", childInstance.getId()); return; } @@ -1425,7 +1423,8 @@ public class ProcessServiceImpl implements ProcessService { /** * complement data needs transform parent parameter to child. */ - protected String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map fatherParams) { + protected String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, + Map fatherParams) { // set sub work process command String processMapStr = JSONUtils.toJsonString(instanceMap); Map cmdParam = JSONUtils.toMap(processMapStr); @@ -1474,7 +1473,8 @@ public class ProcessServiceImpl implements ProcessService { Map subProcessParam = JSONUtils.toMap(task.getTaskParams(), String.class, Object.class); long childDefineCode = 0L; if (subProcessParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)) { - childDefineCode = Long.parseLong(String.valueOf(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE))); + childDefineCode = + Long.parseLong(String.valueOf(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE))); } ProcessDefinition subProcessDefinition = processDefineMapper.queryByCode(childDefineCode); @@ -1493,22 +1493,21 @@ public class ProcessServiceImpl implements ProcessService { String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams); int subProcessInstanceId = childInstance == null ? 0 : childInstance.getId(); return new Command( - commandType, - TaskDependType.TASK_POST, - parentProcessInstance.getFailureStrategy(), - parentProcessInstance.getExecutorId(), - subProcessDefinition.getCode(), - processParam, - parentProcessInstance.getWarningType(), - parentProcessInstance.getWarningGroupId(), - parentProcessInstance.getScheduleTime(), - task.getWorkerGroup(), - task.getEnvironmentCode(), - parentProcessInstance.getProcessInstancePriority(), - parentProcessInstance.getDryRun(), - subProcessInstanceId, - subProcessDefinition.getVersion() - ); + commandType, + TaskDependType.TASK_POST, + parentProcessInstance.getFailureStrategy(), + parentProcessInstance.getExecutorId(), + subProcessDefinition.getCode(), + processParam, + parentProcessInstance.getWarningType(), + parentProcessInstance.getWarningGroupId(), + parentProcessInstance.getScheduleTime(), + task.getWorkerGroup(), + task.getEnvironmentCode(), + parentProcessInstance.getProcessInstancePriority(), + parentProcessInstance.getDryRun(), + subProcessInstanceId, + subProcessDefinition.getVersion()); } /** @@ -1517,7 +1516,7 @@ public class ProcessServiceImpl implements ProcessService { */ private void initSubInstanceState(ProcessInstance childInstance) { if (childInstance != null) { - childInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + childInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); updateProcessInstance(childInstance); } } @@ -1543,8 +1542,9 @@ public class ProcessServiceImpl implements ProcessService { * @param childDefinitionCode childDefinitionId */ private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) { - ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(), - parentProcessInstance.getProcessDefinitionVersion()); + ProcessDefinition fatherDefinition = + this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(), + parentProcessInstance.getProcessDefinitionVersion()); ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode); if (childDefinition != null && fatherDefinition != null) { childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId()); @@ -1561,16 +1561,16 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) { - ExecutionStatus processInstanceState = processInstance.getState(); - if (processInstanceState.typeIsFinished() || processInstanceState == ExecutionStatus.READY_STOP) { + WorkflowExecutionStatus processInstanceState = processInstance.getState(); + if (processInstanceState.isFinished() || processInstanceState == WorkflowExecutionStatus.READY_STOP) { logger.warn("processInstance: {} state was: {}, skip submit this task, taskCode: {}", - processInstance.getId(), - processInstanceState, - taskInstance.getTaskCode()); + processInstance.getId(), + processInstanceState, + taskInstance.getTaskCode()); return null; } - if (processInstanceState == ExecutionStatus.READY_PAUSE) { - taskInstance.setState(ExecutionStatus.PAUSE); + if (processInstanceState == WorkflowExecutionStatus.READY_PAUSE) { + taskInstance.setState(TaskExecutionStatus.KILL); } taskInstance.setExecutorId(processInstance.getExecutorId()); taskInstance.setState(getSubmitTaskState(taskInstance, processInstance)); @@ -1600,28 +1600,26 @@ public class ProcessServiceImpl implements ProcessService { * @return process instance state */ @Override - public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) { - ExecutionStatus state = taskInstance.getState(); + public TaskExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) { + TaskExecutionStatus state = taskInstance.getState(); // running, delayed or killed // the task already exists in task queue // return state - if ( - state == ExecutionStatus.RUNNING_EXECUTION - || state == ExecutionStatus.DELAY_EXECUTION - || state == ExecutionStatus.KILL - || state == ExecutionStatus.DISPATCH - ) { + if (state == TaskExecutionStatus.RUNNING_EXECUTION + || state == TaskExecutionStatus.DELAY_EXECUTION + || state == TaskExecutionStatus.KILL + || state == TaskExecutionStatus.DISPATCH) { return state; } - //return pasue /stop if process instance state is ready pause / stop + // return pasue /stop if process instance state is ready pause / stop // or return submit success - if (processInstance.getState() == ExecutionStatus.READY_PAUSE) { - state = ExecutionStatus.PAUSE; - } else if (processInstance.getState() == ExecutionStatus.READY_STOP - || !checkProcessStrategy(taskInstance, processInstance)) { - state = ExecutionStatus.KILL; + if (processInstance.getState() == WorkflowExecutionStatus.READY_PAUSE) { + state = TaskExecutionStatus.KILL; + } else if (processInstance.getState() == WorkflowExecutionStatus.READY_STOP + || !checkProcessStrategy(taskInstance, processInstance)) { + state = TaskExecutionStatus.KILL; } else { - state = ExecutionStatus.SUBMITTED_SUCCESS; + state = TaskExecutionStatus.SUBMITTED_SUCCESS; } return state; } @@ -1640,8 +1638,8 @@ public class ProcessServiceImpl implements ProcessService { List taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); for (TaskInstance task : taskInstances) { - if (task.getState() == ExecutionStatus.FAILURE - && task.getRetryTimes() >= task.getMaxRetryTimes()) { + if (task.getState() == TaskExecutionStatus.FAILURE + && task.getRetryTimes() >= task.getMaxRetryTimes()) { return false; } } @@ -1754,8 +1752,8 @@ public class ProcessServiceImpl implements ProcessService { taskInstance.setProcessDefine(processInstance.getProcessDefinition()); taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority()); TaskDefinition taskDefinition = this.findTaskDefinition( - taskInstance.getTaskCode(), - taskInstance.getTaskDefinitionVersion()); + taskInstance.getTaskCode(), + taskInstance.getTaskDefinitionVersion()); this.updateTaskDefinitionResources(taskDefinition); taskInstance.setTaskDefine(taskDefinition); } @@ -1768,17 +1766,17 @@ public class ProcessServiceImpl implements ProcessService { @Override public void updateTaskDefinitionResources(TaskDefinition taskDefinition) { Map taskParameters = JSONUtils.parseObject( - taskDefinition.getTaskParams(), - new TypeReference>() { - }); + taskDefinition.getTaskParams(), + new TypeReference>() { + }); if (taskParameters != null) { // if contains mainJar field, query resource from database // Flink, Spark, MR if (taskParameters.containsKey("mainJar")) { Object mainJarObj = taskParameters.get("mainJar"); ResourceInfo mainJar = JSONUtils.parseObject( - JSONUtils.toJsonString(mainJarObj), - ResourceInfo.class); + JSONUtils.toJsonString(mainJarObj), + ResourceInfo.class); ResourceInfo resourceInfo = updateResourceInfo(mainJar); if (resourceInfo != null) { taskParameters.put("mainJar", resourceInfo); @@ -1789,10 +1787,10 @@ public class ProcessServiceImpl implements ProcessService { String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList")); List resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class); List updatedResourceInfos = resourceInfos - .stream() - .map(this::updateResourceInfo) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + .stream() + .map(this::updateResourceInfo) + .filter(Objects::nonNull) + .collect(Collectors.toList()); taskParameters.put("resourceList", updatedResourceInfos); } // set task parameters @@ -1823,7 +1821,7 @@ public class ProcessServiceImpl implements ProcessService { resourceInfo.setResourceName(resource.getFullName()); if (logger.isInfoEnabled()) { logger.info("updated resource info {}", - JSONUtils.toJsonString(resourceInfo)); + JSONUtils.toJsonString(resourceInfo)); } } return resourceInfo; @@ -1837,8 +1835,8 @@ public class ProcessServiceImpl implements ProcessService { * @return task instance states */ @Override - public List findTaskIdByInstanceState(int instanceId, ExecutionStatus state) { - return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.ordinal()); + public List findTaskIdByInstanceState(int instanceId, TaskExecutionStatus state) { + return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.getCode()); } /** @@ -1971,9 +1969,10 @@ public class ProcessServiceImpl implements ProcessService { if (CollectionUtils.isEmpty(properties)) { return; } - //if the result more than one line,just get the first . - Map taskParams = JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference>() { - }); + // if the result more than one line,just get the first . + Map taskParams = + JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference>() { + }); Object localParams = taskParams.get(LOCAL_PARAMS); if (localParams == null) { return; @@ -2042,9 +2041,10 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public Map queryWorkerGroupByProcessDefinitionCodes(List processDefinitionCodeList) { - List processDefinitionScheduleList = scheduleMapper.querySchedulesByProcessDefinitionCodes(processDefinitionCodeList); + List processDefinitionScheduleList = + scheduleMapper.querySchedulesByProcessDefinitionCodes(processDefinitionCodeList); return processDefinitionScheduleList.stream().collect(Collectors.toMap(Schedule::getProcessDefinitionCode, - Schedule::getWorkerGroup)); + Schedule::getWorkerGroup)); } /** @@ -2066,12 +2066,14 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public List queryNeedFailoverProcessInstances(String host) { - return processInstanceMapper.queryByHostAndStatus(host, ExecutionStatus.getNeedFailoverWorkflowInstanceState()); + return processInstanceMapper.queryByHostAndStatus(host, + WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState()); } @Override public List queryNeedFailoverProcessInstanceHost() { - return processInstanceMapper.queryNeedFailoverProcessInstanceHost(ExecutionStatus.getNeedFailoverWorkflowInstanceState()); + return processInstanceMapper + .queryNeedFailoverProcessInstanceHost(WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState()); } /** @@ -2082,18 +2084,20 @@ public class ProcessServiceImpl implements ProcessService { @Override @Transactional public void processNeedFailoverProcessInstances(ProcessInstance processInstance) { - //1 update processInstance host is null + // 1 update processInstance host is null processInstance.setHost(Constants.NULL); processInstanceMapper.updateById(processInstance); - ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); + ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); - //2 insert into recover command + // 2 insert into recover command Command cmd = new Command(); cmd.setProcessDefinitionCode(processDefinition.getCode()); cmd.setProcessDefinitionVersion(processDefinition.getVersion()); cmd.setProcessInstanceId(processInstance.getId()); - cmd.setCommandParam(String.format("{\"%s\":%d}", Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId())); + cmd.setCommandParam( + String.format("{\"%s\":%d}", Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId())); cmd.setExecutorId(processInstance.getExecutorId()); cmd.setCommandType(CommandType.RECOVER_TOLERANCE_FAULT_PROCESS); cmd.setProcessInstancePriority(processInstance.getProcessInstancePriority()); @@ -2109,7 +2113,7 @@ public class ProcessServiceImpl implements ProcessService { @Override public List queryNeedFailoverTaskInstances(String host) { return taskInstanceMapper.queryByHostAndStatus(host, - ExecutionStatus.getNeedFailoverWorkflowInstanceState()); + TaskExecutionStatus.getNeedFailoverWorkflowInstanceState()); } /** @@ -2131,7 +2135,7 @@ public class ProcessServiceImpl implements ProcessService { * @return update process result */ @Override - public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) { + public int updateProcessInstanceState(Integer processInstanceId, WorkflowExecutionStatus executionStatus) { ProcessInstance instance = processInstanceMapper.selectById(processInstanceId); instance.setState(executionStatus); return processInstanceMapper.updateById(instance); @@ -2212,8 +2216,8 @@ public class ProcessServiceImpl implements ProcessService { @Override public ProcessInstance findLastSchedulerProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastSchedulerProcess(definitionCode, - dateInterval.getStartTime(), - dateInterval.getEndTime()); + dateInterval.getStartTime(), + dateInterval.getEndTime()); } /** @@ -2226,8 +2230,8 @@ public class ProcessServiceImpl implements ProcessService { @Override public ProcessInstance findLastManualProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastManualProcess(definitionCode, - dateInterval.getStartTime(), - dateInterval.getEndTime()); + dateInterval.getStartTime(), + dateInterval.getEndTime()); } /** @@ -2241,9 +2245,9 @@ public class ProcessServiceImpl implements ProcessService { @Override public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime) { return processInstanceMapper.queryLastRunningProcess(definitionCode, - startTime, - endTime, - ExecutionStatus.getNeedFailoverWorkflowInstanceState()); + startTime, + endTime, + WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState()); } /** @@ -2340,7 +2344,8 @@ public class ProcessServiceImpl implements ProcessService { case UDF_FILE: List ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks); addAuthorizedResources(ownUdfResources, userId); - Set authorizedResourceFiles = ownUdfResources.stream().map(Resource::getId).collect(toSet()); + Set authorizedResourceFiles = + ownUdfResources.stream().map(Resource::getId).collect(toSet()); originResSet.removeAll(authorizedResourceFiles); break; case RESOURCE_FILE_NAME: @@ -2350,11 +2355,13 @@ public class ProcessServiceImpl implements ProcessService { originResSet.removeAll(authorizedResources); break; case DATASOURCE: - Set authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet()); + Set authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks) + .stream().map(DataSource::getId).collect(toSet()); originResSet.removeAll(authorizedDatasources); break; case UDF: - Set authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet()); + Set authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream() + .map(UdfFunc::getId).collect(toSet()); originResSet.removeAll(authorizedUdfs); break; default: @@ -2409,7 +2416,8 @@ public class ProcessServiceImpl implements ProcessService { if (processInstance == null) { return ""; } - ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); + ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), + processInstance.getProcessDefinitionVersion()); if (definition == null) { return ""; } @@ -2440,18 +2448,21 @@ public class ProcessServiceImpl implements ProcessService { @Override public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) { - List processTaskRelationList = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); + List processTaskRelationList = processTaskRelationMapper + .queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); if (!processTaskRelationList.isEmpty()) { processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode()); } - List processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); + List processTaskRelationLogList = processTaskRelationLogMapper + .queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); int batchInsert = processTaskRelationMapper.batchInsert(processTaskRelationLogList); if (batchInsert == 0) { return Constants.EXIT_CODE_FAILURE; } else { int result = 0; for (ProcessTaskRelationLog taskRelationLog : processTaskRelationLogList) { - int switchResult = switchTaskDefinitionVersion(taskRelationLog.getPostTaskCode(), taskRelationLog.getPostTaskVersion()); + int switchResult = switchTaskDefinitionVersion(taskRelationLog.getPostTaskCode(), + taskRelationLog.getPostTaskVersion()); if (switchResult != Constants.EXIT_CODE_FAILURE) { result++; } @@ -2469,7 +2480,8 @@ public class ProcessServiceImpl implements ProcessService { if (taskDefinition.getVersion() == taskVersion) { return Constants.EXIT_CODE_SUCCESS; } - TaskDefinitionLog taskDefinitionUpdate = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskVersion); + TaskDefinitionLog taskDefinitionUpdate = + taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskVersion); if (taskDefinitionUpdate == null) { return Constants.EXIT_CODE_FAILURE; } @@ -2487,14 +2499,14 @@ public class ProcessServiceImpl implements ProcessService { @Override public String getResourceIds(TaskDefinition taskDefinition) { Set resourceIds = null; - AbstractParameters params = taskPluginManager.getParameters(ParametersNode.builder().taskType(taskDefinition.getTaskType()).taskParams(taskDefinition.getTaskParams()).build()); + AbstractParameters params = taskPluginManager.getParameters(ParametersNode.builder() + .taskType(taskDefinition.getTaskType()).taskParams(taskDefinition.getTaskParams()).build()); if (params != null && CollectionUtils.isNotEmpty(params.getResourceFilesList())) { - resourceIds = params.getResourceFilesList(). - stream() - .filter(t -> t.getId() != 0) - .map(ResourceInfo::getId) - .collect(toSet()); + resourceIds = params.getResourceFilesList().stream() + .filter(t -> t.getId() != 0) + .map(ResourceInfo::getId) + .collect(toSet()); } if (CollectionUtils.isEmpty(resourceIds)) { return ""; @@ -2503,7 +2515,8 @@ public class ProcessServiceImpl implements ProcessService { } @Override - public int saveTaskDefine(User operator, long projectCode, List taskDefinitionLogs, Boolean syncDefine) { + public int saveTaskDefine(User operator, long projectCode, List taskDefinitionLogs, + Boolean syncDefine) { Date now = new Date(); List newTaskDefinitionLogs = new ArrayList<>(); List updateTaskDefinitionLogs = new ArrayList<>(); @@ -2527,7 +2540,7 @@ public class ProcessServiceImpl implements ProcessService { } TaskDefinitionLog definitionCodeAndVersion = taskDefinitionLogMapper - .queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion()); + .queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion()); if (definitionCodeAndVersion == null) { taskDefinitionLog.setUserId(operator.getId()); taskDefinitionLog.setCreateTime(now); @@ -2575,12 +2588,16 @@ public class ProcessServiceImpl implements ProcessService { * save processDefinition (including create or update processDefinition) */ @Override - public int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean syncDefine, Boolean isFromProcessDefine) { + public int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean syncDefine, + Boolean isFromProcessDefine) { ProcessDefinitionLog processDefinitionLog = new ProcessDefinitionLog(processDefinition); Integer version = processDefineLogMapper.queryMaxVersionForDefinition(processDefinition.getCode()); int insertVersion = version == null || version == 0 ? Constants.VERSION_FIRST : version + 1; processDefinitionLog.setVersion(insertVersion); - processDefinitionLog.setReleaseState(!isFromProcessDefine || processDefinitionLog.getReleaseState() == ReleaseState.ONLINE ? ReleaseState.ONLINE : ReleaseState.OFFLINE); + processDefinitionLog + .setReleaseState(!isFromProcessDefine || processDefinitionLog.getReleaseState() == ReleaseState.ONLINE + ? ReleaseState.ONLINE + : ReleaseState.OFFLINE); processDefinitionLog.setOperator(operator.getId()); processDefinitionLog.setOperateTime(processDefinition.getUpdateTime()); int insertLog = processDefineLogMapper.insert(processDefinitionLog); @@ -2600,8 +2617,10 @@ public class ProcessServiceImpl implements ProcessService { * save task relations */ @Override - public int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, int processDefinitionVersion, - List taskRelationList, List taskDefinitionLogs, + public int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, + int processDefinitionVersion, + List taskRelationList, + List taskDefinitionLogs, Boolean syncDefine) { if (taskRelationList.isEmpty()) { return Constants.EXIT_CODE_SUCCESS; @@ -2609,7 +2628,7 @@ public class ProcessServiceImpl implements ProcessService { Map taskDefinitionLogMap = null; if (CollectionUtils.isNotEmpty(taskDefinitionLogs)) { taskDefinitionLogMap = taskDefinitionLogs.stream() - .collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog)); + .collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog)); } Date now = new Date(); for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) { @@ -2617,11 +2636,13 @@ public class ProcessServiceImpl implements ProcessService { processTaskRelationLog.setProcessDefinitionCode(processDefinitionCode); processTaskRelationLog.setProcessDefinitionVersion(processDefinitionVersion); if (taskDefinitionLogMap != null) { - TaskDefinitionLog preTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode()); + TaskDefinitionLog preTaskDefinitionLog = + taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode()); if (preTaskDefinitionLog != null) { processTaskRelationLog.setPreTaskVersion(preTaskDefinitionLog.getVersion()); } - TaskDefinitionLog postTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode()); + TaskDefinitionLog postTaskDefinitionLog = + taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode()); if (postTaskDefinitionLog != null) { processTaskRelationLog.setPostTaskVersion(postTaskDefinitionLog.getVersion()); } @@ -2633,10 +2654,13 @@ public class ProcessServiceImpl implements ProcessService { } int insert = taskRelationList.size(); if (Boolean.TRUE.equals(syncDefine)) { - List processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode); + List processTaskRelationList = + processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode); if (!processTaskRelationList.isEmpty()) { - Set processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet()); - Set taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet()); + Set processTaskRelationSet = + processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet()); + Set taskRelationSet = + taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet()); boolean result = CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet); if (result) { return Constants.EXIT_CODE_SUCCESS; @@ -2654,9 +2678,9 @@ public class ProcessServiceImpl implements ProcessService { List processTaskRelationList = processTaskRelationMapper.queryByTaskCode(taskCode); if (!processTaskRelationList.isEmpty()) { Set processDefinitionCodes = processTaskRelationList - .stream() - .map(ProcessTaskRelation::getProcessDefinitionCode) - .collect(toSet()); + .stream() + .map(ProcessTaskRelation::getProcessDefinitionCode) + .collect(toSet()); List processDefinitionList = processDefineMapper.queryByCodes(processDefinitionCodes); // check process definition is already online for (ProcessDefinition processDefinition : processDefinitionList) { @@ -2677,7 +2701,8 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public DAG genDagGraph(ProcessDefinition processDefinition) { - List taskRelations = this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); + List taskRelations = + this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); List taskNodeList = transformTask(taskRelations, Lists.newArrayList()); ProcessDag processDag = DagHelper.getProcessDag(taskNodeList, new ArrayList<>(taskRelations)); // Generate concrete Dag to be executed @@ -2689,9 +2714,11 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public DagData genDagData(ProcessDefinition processDefinition) { - List taskRelations = this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); + List taskRelations = + this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); List taskDefinitionLogList = genTaskDefineList(taskRelations); - List taskDefinitions = taskDefinitionLogList.stream().map(t -> (TaskDefinition) t).collect(Collectors.toList()); + List taskDefinitions = + taskDefinitionLogList.stream().map(t -> (TaskDefinition) t).collect(Collectors.toList()); return new DagData(processDefinition, taskRelations, taskDefinitions); } @@ -2700,10 +2727,12 @@ public class ProcessServiceImpl implements ProcessService { Set taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelation processTaskRelation : processTaskRelations) { if (processTaskRelation.getPreTaskCode() > 0) { - taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion())); + taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), + processTaskRelation.getPreTaskVersion())); } if (processTaskRelation.getPostTaskCode() > 0) { - taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); + taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), + processTaskRelation.getPostTaskVersion())); } } if (taskDefinitionSet.isEmpty()) { @@ -2743,7 +2772,8 @@ public class ProcessServiceImpl implements ProcessService { */ @Override public List findRelationByCode(long processDefinitionCode, int processDefinitionVersion) { - List processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinitionCode, processDefinitionVersion); + List processTaskRelationLogList = processTaskRelationLogMapper + .queryByProcessCodeAndVersion(processDefinitionCode, processDefinitionVersion); return processTaskRelationLogList.stream().map(r -> (ProcessTaskRelation) r).collect(Collectors.toList()); } @@ -2755,7 +2785,9 @@ public class ProcessServiceImpl implements ProcessService { */ private void addAuthorizedResources(List ownResources, int userId) { List relationResourceIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, 7); - List relationResources = CollectionUtils.isNotEmpty(relationResourceIds) ? resourceMapper.queryResourceListById(relationResourceIds) : new ArrayList<>(); + List relationResources = CollectionUtils.isNotEmpty(relationResourceIds) + ? resourceMapper.queryResourceListById(relationResourceIds) + : new ArrayList<>(); ownResources.addAll(relationResources); } @@ -2763,7 +2795,8 @@ public class ProcessServiceImpl implements ProcessService { * Use temporarily before refactoring taskNode */ @Override - public List transformTask(List taskRelationList, List taskDefinitionLogs) { + public List transformTask(List taskRelationList, + List taskDefinitionLogs) { Map> taskCodeMap = new HashMap<>(); for (ProcessTaskRelation processTaskRelation : taskRelationList) { taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> { @@ -2780,7 +2813,7 @@ public class ProcessServiceImpl implements ProcessService { taskDefinitionLogs = genTaskDefineList(taskRelationList); } Map taskDefinitionLogMap = taskDefinitionLogs.stream() - .collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); + .collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); List taskNodeList = new ArrayList<>(); for (Entry> code : taskCodeMap.entrySet()) { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(code.getKey()); @@ -2791,7 +2824,8 @@ public class ProcessServiceImpl implements ProcessService { taskNode.setName(taskDefinitionLog.getName()); taskNode.setDesc(taskDefinitionLog.getDescription()); taskNode.setType(taskDefinitionLog.getTaskType().toUpperCase()); - taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); + taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL + : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); taskNode.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes()); taskNode.setRetryInterval(taskDefinitionLog.getFailRetryInterval()); Map taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams()); @@ -2804,11 +2838,13 @@ public class ProcessServiceImpl implements ProcessService { taskNode.setTaskInstancePriority(taskDefinitionLog.getTaskPriority()); taskNode.setWorkerGroup(taskDefinitionLog.getWorkerGroup()); taskNode.setEnvironmentCode(taskDefinitionLog.getEnvironmentCode()); - taskNode.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, - taskDefinitionLog.getTimeoutNotifyStrategy(), - taskDefinitionLog.getTimeout()))); + taskNode.setTimeout(JSONUtils + .toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, + taskDefinitionLog.getTimeoutNotifyStrategy(), + taskDefinitionLog.getTimeout()))); taskNode.setDelayTime(taskDefinitionLog.getDelayTime()); - taskNode.setPreTasks(JSONUtils.toJsonString(code.getValue().stream().map(taskDefinitionLogMap::get).map(TaskDefinition::getCode).collect(Collectors.toList()))); + taskNode.setPreTasks(JSONUtils.toJsonString(code.getValue().stream().map(taskDefinitionLogMap::get) + .map(TaskDefinition::getCode).collect(Collectors.toList()))); taskNode.setTaskGroupId(taskDefinitionLog.getTaskGroupId()); taskNode.setTaskGroupPriority(taskDefinitionLog.getTaskGroupPriority()); taskNode.setCpuQuota(taskDefinitionLog.getCpuQuota()); @@ -2822,7 +2858,7 @@ public class ProcessServiceImpl implements ProcessService { @Override public Map notifyProcessList(int processId) { HashMap processTaskMap = new HashMap<>(); - //find sub tasks + // find sub tasks ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId); if (processInstanceMap == null) { return processTaskMap; @@ -2844,7 +2880,8 @@ public class ProcessServiceImpl implements ProcessService { @Override public int updateDqExecuteResultUserId(int taskInstanceId) { DqExecuteResult dqExecuteResult = - dqExecuteResultMapper.selectOne(new QueryWrapper().eq(TASK_INSTANCE_ID, taskInstanceId)); + dqExecuteResultMapper + .selectOne(new QueryWrapper().eq(TASK_INSTANCE_ID, taskInstanceId)); if (dqExecuteResult == null) { return -1; } @@ -2854,7 +2891,8 @@ public class ProcessServiceImpl implements ProcessService { return -1; } - ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); + ProcessDefinition processDefinition = + processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode()); if (processDefinition == null) { return -1; } @@ -2873,15 +2911,15 @@ public class ProcessServiceImpl implements ProcessService { @Override public int deleteDqExecuteResultByTaskInstanceId(int taskInstanceId) { return dqExecuteResultMapper.delete( - new QueryWrapper() - .eq(TASK_INSTANCE_ID, taskInstanceId)); + new QueryWrapper() + .eq(TASK_INSTANCE_ID, taskInstanceId)); } @Override public int deleteTaskStatisticsValueByTaskInstanceId(int taskInstanceId) { return dqTaskStatisticsValueMapper.delete( - new QueryWrapper() - .eq(TASK_INSTANCE_ID, taskInstanceId)); + new QueryWrapper() + .eq(TASK_INSTANCE_ID, taskInstanceId)); } @Override @@ -2923,7 +2961,8 @@ public class ProcessServiceImpl implements ProcessService { // Create a waiting taskGroupQueue, after acquire resource, we can update the status to ACQUIRE_SUCCESS TaskGroupQueue taskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskId); if (taskGroupQueue == null) { - taskGroupQueue = insertIntoTaskGroupQueue(taskId, taskName, groupId, processId, priority, TaskGroupQueueStatus.WAIT_QUEUE); + taskGroupQueue = insertIntoTaskGroupQueue(taskId, taskName, groupId, processId, priority, + TaskGroupQueueStatus.WAIT_QUEUE); } else { logger.info("The task queue is already exist, taskId: {}", taskId); if (taskGroupQueue.getStatus() == TaskGroupQueueStatus.ACQUIRE_SUCCESS) { @@ -2933,12 +2972,13 @@ public class ProcessServiceImpl implements ProcessService { taskGroupQueue.setStatus(TaskGroupQueueStatus.WAIT_QUEUE); this.taskGroupQueueMapper.updateById(taskGroupQueue); } - //check if there already exist higher priority tasks - List highPriorityTasks = taskGroupQueueMapper.queryHighPriorityTasks(groupId, priority, TaskGroupQueueStatus.WAIT_QUEUE.getCode()); + // check if there already exist higher priority tasks + List highPriorityTasks = taskGroupQueueMapper.queryHighPriorityTasks(groupId, priority, + TaskGroupQueueStatus.WAIT_QUEUE.getCode()); if (CollectionUtils.isNotEmpty(highPriorityTasks)) { return false; } - //try to get taskGroup + // try to get taskGroup int count = taskGroupMapper.selectAvailableCountById(groupId); if (count == 1 && robTaskGroupResource(taskGroupQueue)) { return true; @@ -2954,8 +2994,8 @@ public class ProcessServiceImpl implements ProcessService { public boolean robTaskGroupResource(TaskGroupQueue taskGroupQueue) { TaskGroup taskGroup = taskGroupMapper.selectById(taskGroupQueue.getGroupId()); int affectedCount = taskGroupMapper.updateTaskGroupResource(taskGroup.getId(), - taskGroupQueue.getId(), - TaskGroupQueueStatus.WAIT_QUEUE.getCode()); + taskGroupQueue.getId(), + TaskGroupQueueStatus.WAIT_QUEUE.getCode()); if (affectedCount > 0) { taskGroupQueue.setStatus(TaskGroupQueueStatus.ACQUIRE_SUCCESS); this.taskGroupQueueMapper.updateById(taskGroupQueue); @@ -2967,7 +3007,8 @@ public class ProcessServiceImpl implements ProcessService { @Override public void releaseAllTaskGroup(int processInstanceId) { - List taskInstances = this.taskInstanceMapper.loadAllInfosNoRelease(processInstanceId, TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()); + List taskInstances = this.taskInstanceMapper.loadAllInfosNoRelease(processInstanceId, + TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()); for (TaskInstance info : taskInstances) { releaseTaskGroup(info); } @@ -2994,10 +3035,10 @@ public class ProcessServiceImpl implements ProcessService { return null; } } while (thisTaskGroupQueue.getForceStart() == Flag.NO.getCode() - && taskGroupMapper.releaseTaskGroupResource(taskGroup.getId(), - taskGroup.getUseSize(), - thisTaskGroupQueue.getId(), - TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()) != 1); + && taskGroupMapper.releaseTaskGroupResource(taskGroup.getId(), + taskGroup.getUseSize(), + thisTaskGroupQueue.getId(), + TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()) != 1); } catch (Exception e) { logger.error("release the task group error", e); return null; @@ -3007,15 +3048,15 @@ public class ProcessServiceImpl implements ProcessService { TaskGroupQueue taskGroupQueue; do { taskGroupQueue = this.taskGroupQueueMapper.queryTheHighestPriorityTasks(taskGroup.getId(), - TaskGroupQueueStatus.WAIT_QUEUE.getCode(), - Flag.NO.getCode(), - Flag.NO.getCode()); + TaskGroupQueueStatus.WAIT_QUEUE.getCode(), + Flag.NO.getCode(), + Flag.NO.getCode()); if (taskGroupQueue == null) { return null; } } while (this.taskGroupQueueMapper.updateInQueueCAS(Flag.NO.getCode(), - Flag.YES.getCode(), - taskGroupQueue.getId()) != 1); + Flag.YES.getCode(), + taskGroupQueue.getId()) != 1); return this.taskInstanceMapper.selectById(taskGroupQueue.getTaskId()); } @@ -3074,8 +3115,7 @@ public class ProcessServiceImpl implements ProcessService { public void sendStartTask2Master(ProcessInstance processInstance, int taskId, org.apache.dolphinscheduler.remote.command.CommandType taskType) { TaskEventChangeCommand taskEventChangeCommand = new TaskEventChangeCommand( - processInstance.getId(), taskId - ); + processInstance.getId(), taskId); Host host = new Host(processInstance.getHost()); stateEventCallbackService.sendResult(host, taskEventChangeCommand.convert2Command(taskType)); } @@ -3117,20 +3157,25 @@ public class ProcessServiceImpl implements ProcessService { return; } ProcessInstance processInstance = findProcessInstanceDetailById(task.getProcessInstanceId()); - if (processInstance != null && (processInstance.getState().typeIsFailure() || processInstance.getState().typeIsCancel())) { + if (processInstance != null + && (processInstance.getState().isFailure() || processInstance.getState().isStop())) { List validTaskList = findValidTaskListByProcessId(processInstance.getId()); - List instanceTaskCodeList = validTaskList.stream().map(TaskInstance::getTaskCode).collect(Collectors.toList()); + List instanceTaskCodeList = + validTaskList.stream().map(TaskInstance::getTaskCode).collect(Collectors.toList()); List taskRelations = findRelationByCode(processInstance.getProcessDefinitionCode(), - processInstance.getProcessDefinitionVersion()); + processInstance.getProcessDefinitionVersion()); List taskDefinitionLogs = genTaskDefineList(taskRelations); - List definiteTaskCodeList = taskDefinitionLogs.stream().filter(definitionLog -> definitionLog.getFlag() == Flag.YES) - .map(TaskDefinitionLog::getCode).collect(Collectors.toList()); + List definiteTaskCodeList = + taskDefinitionLogs.stream().filter(definitionLog -> definitionLog.getFlag() == Flag.YES) + .map(TaskDefinitionLog::getCode).collect(Collectors.toList()); // only all tasks have instances - if (org.apache.dolphinscheduler.common.utils.CollectionUtils.equalLists(instanceTaskCodeList, definiteTaskCodeList)) { - List failTaskList = validTaskList.stream().filter(instance -> instance.getState().typeIsFailure() || instance.getState().typeIsCancel()) - .map(TaskInstance::getId).collect(Collectors.toList()); + if (org.apache.dolphinscheduler.common.utils.CollectionUtils.equalLists(instanceTaskCodeList, + definiteTaskCodeList)) { + List failTaskList = validTaskList.stream() + .filter(instance -> instance.getState().isFailure() || instance.getState().isKill()) + .map(TaskInstance::getId).collect(Collectors.toList()); if (failTaskList.size() == 1 && failTaskList.contains(taskInstanceId)) { - processInstance.setState(ExecutionStatus.SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUCCESS); updateProcessInstance(processInstance); } } diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java index 0499e3716f..5dbd26b173 100644 --- a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java +++ b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/AlertClientServiceTest.java @@ -67,82 +67,90 @@ public class AlertClientServiceTest { String title = "test-title"; String content = "test-content"; - //1.alter server does not exist - AlertSendResponseCommand alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + // 1.alter server does not exist + AlertSendResponseCommand alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); Assert.assertNull(alertSendResponseCommand); - AlertSendRequestCommand alertSendRequestCommand = new AlertSendRequestCommand(groupId,title,content, WarningType.FAILURE.getCode()); + AlertSendRequestCommand alertSendRequestCommand = + new AlertSendRequestCommand(groupId, title, content, WarningType.FAILURE.getCode()); Command reqCommand = alertSendRequestCommand.convert2Command(); boolean sendResponseStatus; List sendResponseResults = new ArrayList<>(); - //2.alter instance does not exist + // 2.alter instance does not exist sendResponseStatus = false; AlertSendResponseResult alertResult = new AlertSendResponseResult(); - String message = String.format("Alert GroupId %s send error : not found alert instance",groupId); - alertResult.setStatus(false); + String message = String.format("Alert GroupId %s send error : not found alert instance", groupId); + alertResult.setSuccess(false); alertResult.setMessage(message); sendResponseResults.add(alertResult); - AlertSendResponseCommand alertSendResponseCommandData = new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); + AlertSendResponseCommand alertSendResponseCommandData = + new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); Command resCommand = alertSendResponseCommandData.convert2Command(reqCommand.getOpaque()); PowerMockito.when(client.sendSync(Mockito.any(), Mockito.any(), Mockito.anyLong())).thenReturn(resCommand); - alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage())); + alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //3.alter plugin does not exist + // 3.alter plugin does not exist sendResponseStatus = false; String pluginInstanceName = "alert-mail"; - message = String.format("Alert Plugin %s send error : return value is null",pluginInstanceName); - alertResult.setStatus(false); + message = String.format("Alert Plugin %s send error : return value is null", pluginInstanceName); + alertResult.setSuccess(false); alertResult.setMessage(message); alertSendResponseCommandData = new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); resCommand = alertSendResponseCommandData.convert2Command(reqCommand.getOpaque()); PowerMockito.when(client.sendSync(Mockito.any(), Mockito.any(), Mockito.anyLong())).thenReturn(resCommand); - alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage())); + alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //4.alter result is null + // 4.alter result is null sendResponseStatus = false; - message = String.format("Alert Plugin %s send error : return result value is null",pluginInstanceName); - alertResult.setStatus(false); + message = String.format("Alert Plugin %s send error : return result value is null", pluginInstanceName); + alertResult.setSuccess(false); alertResult.setMessage(message); alertSendResponseCommandData = new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); resCommand = alertSendResponseCommandData.convert2Command(reqCommand.getOpaque()); PowerMockito.when(client.sendSync(Mockito.any(), Mockito.any(), Mockito.anyLong())).thenReturn(resCommand); - alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage())); + alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //5.abnormal information inside the alert plug-in code + // 5.abnormal information inside the alert plug-in code sendResponseStatus = false; - alertResult.setStatus(false); + alertResult.setSuccess(false); alertResult.setMessage("Abnormal information inside the alert plug-in code"); alertSendResponseCommandData = new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); resCommand = alertSendResponseCommandData.convert2Command(reqCommand.getOpaque()); PowerMockito.when(client.sendSync(Mockito.any(), Mockito.any(), Mockito.anyLong())).thenReturn(resCommand); - alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); - Assert.assertFalse(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage())); + alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + Assert.assertFalse(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); - //6.alert plugin send success + // 6.alert plugin send success sendResponseStatus = true; - message = String.format("Alert Plugin %s send success",pluginInstanceName); - alertResult.setStatus(true); + message = String.format("Alert Plugin %s send success", pluginInstanceName); + alertResult.setSuccess(true); alertResult.setMessage(message); alertSendResponseCommandData = new AlertSendResponseCommand(sendResponseStatus, sendResponseResults); resCommand = alertSendResponseCommandData.convert2Command(reqCommand.getOpaque()); PowerMockito.when(client.sendSync(Mockito.any(), Mockito.any(), Mockito.anyLong())).thenReturn(resCommand); - alertSendResponseCommand = alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); - Assert.assertTrue(alertSendResponseCommand.getResStatus()); - alertSendResponseCommand.getResResults().forEach(result -> - logger.info("alert send response result, status:{}, message:{}",result.getStatus(),result.getMessage())); + alertSendResponseCommand = + alertClient.sendAlert(host, port, groupId, title, content, WarningType.FAILURE.getCode()); + Assert.assertTrue(alertSendResponseCommand.isSuccess()); + alertSendResponseCommand.getResResults().forEach(result -> logger + .info("alert send response result, status:{}, message:{}", result.isSuccess(), result.getMessage())); if (Objects.nonNull(alertClient) && alertClient.isRunning()) { alertClient.close(); diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManagerTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManagerTest.java index 5c0d4bbcd8..ec37903c9c 100644 --- a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManagerTest.java +++ b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManagerTest.java @@ -19,11 +19,11 @@ package org.apache.dolphinscheduler.service.alert; import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus; import org.apache.dolphinscheduler.dao.AlertDao; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.ProjectUser; import org.apache.dolphinscheduler.dao.entity.TaskInstance; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import java.util.ArrayList; import java.util.Date; @@ -70,7 +70,6 @@ public class ProcessAlertManagerTest { processAlertManager.sendAlertWorkerToleranceFault(processInstance, taskInstanceList); } - /** * send worker alert fault tolerance */ @@ -79,7 +78,7 @@ public class ProcessAlertManagerTest { // process instance ProcessInstance processInstance = new ProcessInstance(); processInstance.setWarningType(WarningType.SUCCESS); - processInstance.setState(ExecutionStatus.SUCCESS); + processInstance.setState(WorkflowExecutionStatus.SUCCESS); processInstance.setCommandType(CommandType.COMPLEMENT_DATA); processInstance.setWarningGroupId(1); @@ -101,7 +100,7 @@ public class ProcessAlertManagerTest { processInstance.setId(1); processInstance.setName("test-process-01"); processInstance.setCommandType(CommandType.START_PROCESS); - processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); + processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION); processInstance.setRunTimes(0); processInstance.setStartTime(new Date()); processInstance.setEndTime(new Date()); @@ -110,6 +109,6 @@ public class ProcessAlertManagerTest { ProjectUser projectUser = new ProjectUser(); - processAlertManager.sendProcessBlockingAlert(processInstance,projectUser); + processAlertManager.sendProcessBlockingAlert(processInstance, projectUser); } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java index 060609858e..70e9822ed9 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java @@ -17,7 +17,7 @@ package org.apache.dolphinscheduler.plugin.task.api; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.TaskAlertInfo; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; @@ -51,7 +51,6 @@ public abstract class AbstractTask { */ protected String appIds; - /** * cancel */ @@ -175,17 +174,17 @@ public abstract class AbstractTask { * * @return exit status */ - public ExecutionStatus getExitStatus() { - ExecutionStatus status; + public TaskExecutionStatus getExitStatus() { + TaskExecutionStatus status; switch (getExitStatusCode()) { case TaskConstants.EXIT_CODE_SUCCESS: - status = ExecutionStatus.SUCCESS; + status = TaskExecutionStatus.SUCCESS; break; case TaskConstants.EXIT_CODE_KILL: - status = ExecutionStatus.KILL; + status = TaskExecutionStatus.KILL; break; default: - status = ExecutionStatus.FAILURE; + status = TaskExecutionStatus.FAILURE; break; } return status; diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java index aa95cedca0..faf48a59c8 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java @@ -17,7 +17,7 @@ package org.apache.dolphinscheduler.plugin.task.api; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; @@ -112,7 +112,6 @@ public class TaskExecutionContext implements Serializable { */ private int processInstanceId; - /** * process instance schedule time */ @@ -123,19 +122,16 @@ public class TaskExecutionContext implements Serializable { */ private String globalParams; - /** * execute user id */ private int executorId; - /** * command type if complement */ private int cmdTypeIfComplement; - /** * tenant code */ @@ -146,7 +142,6 @@ public class TaskExecutionContext implements Serializable { */ private String queue; - /** * process define id */ @@ -215,7 +210,7 @@ public class TaskExecutionContext implements Serializable { /** * current execution status */ - private ExecutionStatus currentExecutionStatus; + private TaskExecutionStatus currentExecutionStatus; /** * Task Logger name should be like: diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java deleted file mode 100644 index 411de30c34..0000000000 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ExecutionStatus.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * 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.apache.dolphinscheduler.plugin.task.api.enums; - -import java.util.HashMap; - -import com.baomidou.mybatisplus.annotation.EnumValue; - -/** - * running status for workflow and task nodes - */ -public enum ExecutionStatus { - - /** - * status： - * 0 submit success - * 1 running - * 2 ready pause - * 3 pause - * 4 ready stop - * 5 stop - * 6 failure - * 7 success - * 8 need fault tolerance - * 9 kill - * 10 waiting thread - * 11 waiting depend node complete - * 12 delay execution - * 13 forced success - * 14 serial wait - * 15 ready block - * 16 block - * 17 dispatch - */ - SUBMITTED_SUCCESS(0, "submit success"), - RUNNING_EXECUTION(1, "running"), - READY_PAUSE(2, "ready pause"), - PAUSE(3, "pause"), - READY_STOP(4, "ready stop"), - STOP(5, "stop"), - FAILURE(6, "failure"), - SUCCESS(7, "success"), - NEED_FAULT_TOLERANCE(8, "need fault tolerance"), - KILL(9, "kill"), - WAITING_THREAD(10, "waiting thread"), - WAITING_DEPEND(11, "waiting depend node complete"), - DELAY_EXECUTION(12, "delay execution"), - FORCED_SUCCESS(13, "forced success"), - SERIAL_WAIT(14, "serial wait"), - READY_BLOCK(15, "ready block"), - BLOCK(16, "block"), - DISPATCH(17, "dispatch"), - ; - - ExecutionStatus(int code, String descp) { - this.code = code; - this.descp = descp; - } - - @EnumValue - private final int code; - private final String descp; - - private static HashMap EXECUTION_STATUS_MAP = new HashMap<>(); - - private static final int[] NEED_FAILOVER_STATES = new int[] { - ExecutionStatus.SUBMITTED_SUCCESS.ordinal(), - ExecutionStatus.DISPATCH.ordinal(), - ExecutionStatus.RUNNING_EXECUTION.ordinal(), - ExecutionStatus.DELAY_EXECUTION.ordinal(), - ExecutionStatus.READY_PAUSE.ordinal(), - ExecutionStatus.READY_STOP.ordinal() - }; - - static { - for (ExecutionStatus executionStatus : ExecutionStatus.values()) { - EXECUTION_STATUS_MAP.put(executionStatus.code, executionStatus); - } - } - - /** - * status is success - * - * @return status - */ - public boolean typeIsSuccess() { - return this == SUCCESS || this == FORCED_SUCCESS; - } - - /** - * status is failure - * - * @return status - */ - public boolean typeIsFailure() { - return this == FAILURE || this == NEED_FAULT_TOLERANCE; - } - - /** - * status is finished - * - * @return status - */ - public boolean typeIsFinished() { - return typeIsSuccess() || typeIsFailure() || typeIsCancel() || typeIsPause() - || typeIsStop() || typeIsBlock(); - } - - /** - * status is waiting thread - * - * @return status - */ - public boolean typeIsWaitingThread() { - return this == WAITING_THREAD; - } - - /** - * status is pause - * - * @return status - */ - public boolean typeIsPause() { - return this == PAUSE; - } - - /** - * status is pause - * - * @return status - */ - public boolean typeIsStop() { - return this == STOP; - } - - /** - * status is running - * - * @return status - */ - public boolean typeIsRunning() { - return this == RUNNING_EXECUTION || this == WAITING_DEPEND || this == DELAY_EXECUTION; - } - - /** - * status is block - * - * @return status - */ - public boolean typeIsBlock() { - return this == BLOCK; - } - - /** - * status is cancel - * - * @return status - */ - public boolean typeIsCancel() { - return this == KILL || this == STOP; - } - - public int getCode() { - return code; - } - - public String getDescp() { - return descp; - } - - public static ExecutionStatus of(int status) { - if (EXECUTION_STATUS_MAP.containsKey(status)) { - return EXECUTION_STATUS_MAP.get(status); - } - throw new IllegalArgumentException("invalid status : " + status); - } - - public static boolean isNeedFailoverWorkflowInstanceState(ExecutionStatus executionStatus) { - return - ExecutionStatus.SUBMITTED_SUCCESS == executionStatus - || ExecutionStatus.DISPATCH == executionStatus - || ExecutionStatus.RUNNING_EXECUTION == executionStatus - || ExecutionStatus.DELAY_EXECUTION == executionStatus - || ExecutionStatus.READY_PAUSE == executionStatus - || ExecutionStatus.READY_STOP == executionStatus; - } - - public static int[] getNeedFailoverWorkflowInstanceState() { - return NEED_FAILOVER_STATES; - } -} diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java new file mode 100644 index 0000000000..5ca3f893d2 --- /dev/null +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/TaskExecutionStatus.java @@ -0,0 +1,126 @@ +/* + * 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.apache.dolphinscheduler.plugin.task.api.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; + +import java.util.HashMap; +import java.util.Map; + +public enum TaskExecutionStatus { + + SUBMITTED_SUCCESS(0, "submit success"), + RUNNING_EXECUTION(1, "running"), + FAILURE(6, "failure"), + SUCCESS(7, "success"), + NEED_FAULT_TOLERANCE(8, "need fault tolerance"), + KILL(9, "kill"), + DELAY_EXECUTION(12, "delay execution"), + FORCED_SUCCESS(13, "forced success"), + DISPATCH(17, "dispatch"), + + ; + + private static final Map CODE_MAP = new HashMap<>(); + private static final int[] NEED_FAILOVER_STATES = new int[]{ + SUBMITTED_SUCCESS.getCode(), + DISPATCH.getCode(), + RUNNING_EXECUTION.getCode(), + DELAY_EXECUTION.getCode(), + }; + + static { + for (TaskExecutionStatus executionStatus : TaskExecutionStatus.values()) { + CODE_MAP.put(executionStatus.getCode(), executionStatus); + } + } + + /** + * Get TaskExecutionStatus by code, if the code is invalidated will throw {@link IllegalArgumentException}. + */ + public static TaskExecutionStatus of(int code) { + TaskExecutionStatus taskExecutionStatus = CODE_MAP.get(code); + if (taskExecutionStatus == null) { + throw new IllegalArgumentException(String.format("The task execution status code: %s is invalidated", + code)); + } + return taskExecutionStatus; + } + + public boolean isRunning() { + return this == RUNNING_EXECUTION; + } + + public boolean isSuccess() { + return this == TaskExecutionStatus.SUCCESS; + } + + public boolean isForceSuccess() { + return this == TaskExecutionStatus.FORCED_SUCCESS; + } + + public boolean isKill() { + return this == TaskExecutionStatus.KILL; + } + + public boolean isFailure() { + return this == TaskExecutionStatus.FAILURE; + } + + public boolean isFinished() { + return isSuccess() || isKill() || isFailure(); + } + + public boolean isNeedFaultTolerance() { + return this == NEED_FAULT_TOLERANCE; + } + + public static int[] getNeedFailoverWorkflowInstanceState() { + return NEED_FAILOVER_STATES; + } + + public boolean shouldFailover() { + return SUBMITTED_SUCCESS == this + || DISPATCH == this + || RUNNING_EXECUTION == this + || DELAY_EXECUTION == this; + } + + @EnumValue + private final int code; + private final String desc; + + TaskExecutionStatus(int code, String desc) { + this.code = code; + this.desc = desc; + } + + public int getCode() { + return code; + } + + public String getDesc() { + return desc; + } + + @Override + public String toString() { + return "TaskExecutionStatus{" + "code=" + code + ", desc='" + desc + '\'' + '}'; + } + +} diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model/DependentItem.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model/DependentItem.java index 8252bb1904..0a9cf3f499 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model/DependentItem.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model/DependentItem.java @@ -17,20 +17,23 @@ package org.apache.dolphinscheduler.plugin.task.api.model; +import lombok.Data; import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; /** * dependent item */ +@Data public class DependentItem { + private long projectCode; private long definitionCode; private long depTaskCode; private String cycle; private String dateValue; private DependResult dependResult; - private ExecutionStatus status; + private TaskExecutionStatus status; public String getKey() { return String.format("%d-%d-%s-%s", @@ -40,59 +43,4 @@ public class DependentItem { getDateValue()); } - public long getProjectCode() { - return projectCode; - } - - public void setProjectCode(long projectCode) { - this.projectCode = projectCode; - } - - public long getDefinitionCode() { - return definitionCode; - } - - public void setDefinitionCode(long definitionCode) { - this.definitionCode = definitionCode; - } - - public long getDepTaskCode() { - return depTaskCode; - } - - public void setDepTaskCode(long depTaskCode) { - this.depTaskCode = depTaskCode; - } - - public String getCycle() { - return cycle; - } - - public void setCycle(String cycle) { - this.cycle = cycle; - } - - public String getDateValue() { - return dateValue; - } - - public void setDateValue(String dateValue) { - this.dateValue = dateValue; - } - - public DependResult getDependResult() { - return dependResult; - } - - public void setDependResult(DependResult dependResult) { - this.dependResult = dependResult; - } - - public ExecutionStatus getStatus() { - return status; - } - - public void setStatus(ExecutionStatus status) { - this.status = status; - } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/test/java/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/test/java/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.java index d02dd8d4a1..07a624a3e6 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/test/java/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-pigeon/src/test/java/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.java @@ -22,7 +22,6 @@ import static com.github.dreamhead.moco.MocoJsonRunner.jsonHttpServer; import static com.github.dreamhead.moco.Runner.running; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.commons.io.IOUtils; @@ -34,6 +33,7 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; import com.github.dreamhead.moco.HttpServer; public class PigeonTaskTest { + private static final Logger logger = LoggerFactory.getLogger(PigeonTaskTest.class); private PigeonTask pigeonTask; @@ -63,9 +64,11 @@ public class PigeonTaskTest { Mockito.when(taskExecutionContext.getStartTime()).thenReturn(new Date()); Mockito.when(taskExecutionContext.getTaskTimeout()).thenReturn(10000); Mockito.when(taskExecutionContext.getLogPath()).thenReturn("/tmp/dx"); - // Mockito.when(taskExecutionContext.getVarPool()) - // .thenReturn("[{\"direct\":\"IN\",\"prop\":\"" + TISTask.KEY_POOL_VAR_TIS_HOST + "\",\"type\":\"VARCHAR\",\"value\":\"127.0.0.1:8080\"}]"); - Map gloabParams = Collections.singletonMap(PigeonTask.KEY_POOL_VAR_PIGEON_HOST, "127.0.0.1:8080"); + // Mockito.when(taskExecutionContext.getVarPool()) + // .thenReturn("[{\"direct\":\"IN\",\"prop\":\"" + TISTask.KEY_POOL_VAR_TIS_HOST + + // "\",\"type\":\"VARCHAR\",\"value\":\"127.0.0.1:8080\"}]"); + Map gloabParams = + Collections.singletonMap(PigeonTask.KEY_POOL_VAR_PIGEON_HOST, "127.0.0.1:8080"); Mockito.when(taskExecutionContext.getDefinedParams()).thenReturn(gloabParams); pigeonTask = new PigeonTask(taskExecutionContext); @@ -80,21 +83,24 @@ public class PigeonTaskTest { Assert.assertEquals("http://127.0.0.1:8080/tjs/coredefine/coredefine.ajax", cfg.getJobTriggerUrl(tisHost)); String jobName = "mysql_elastic"; int taskId = 123; - Assert.assertEquals("ws://" + tisHost + "/tjs/download/logfeedback?logtype=full&collection=mysql_elastic&taskid=" + taskId - , cfg.getJobLogsFetchUrl(tisHost, jobName, taskId)); + Assert.assertEquals( + "ws://" + tisHost + "/tjs/download/logfeedback?logtype=full&collection=mysql_elastic&taskid=" + taskId, + cfg.getJobLogsFetchUrl(tisHost, jobName, taskId)); Assert.assertEquals("action=datax_action&emethod=trigger_fullbuild_task", cfg.getJobTriggerPostBody()); - Assert.assertEquals("http://127.0.0.1:8080/tjs/config/config.ajax?action=collection_action&emethod=get_task_status", cfg.getJobStatusUrl(tisHost)); + Assert.assertEquals( + "http://127.0.0.1:8080/tjs/config/config.ajax?action=collection_action&emethod=get_task_status", + cfg.getJobStatusUrl(tisHost)); Assert.assertEquals("{\n taskid: " + taskId + "\n, log: false }", cfg.getJobStatusPostBody(taskId)); - Assert.assertEquals("action=core_action&event_submit_do_cancel_task=y&taskid=" + taskId, cfg.getJobCancelPostBody(taskId)); + Assert.assertEquals("action=core_action&event_submit_do_cancel_task=y&taskid=" + taskId, + cfg.getJobCancelPostBody(taskId)); } @Test - public void testInit() - throws Exception { + public void testInit() throws Exception { try { pigeonTask.init(); } catch (Exception e) { @@ -103,14 +109,14 @@ public class PigeonTaskTest { } @Test - public void testHandle() - throws Exception { - HttpServer server = jsonHttpServer(8080, file("src/test/resources/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.json")); + public void testHandle() throws Exception { + HttpServer server = jsonHttpServer(8080, + file("src/test/resources/org/apache/dolphinscheduler/plugin/task/pigeon/PigeonTaskTest.json")); running(server, () -> { pigeonTask.handle(); - Assert.assertEquals("PIGEON execute be success", ExecutionStatus.SUCCESS, pigeonTask.getExitStatus()); + Assert.assertEquals("PIGEON execute be success", TaskExecutionStatus.SUCCESS, pigeonTask.getExitStatus()); }); } @@ -125,14 +131,14 @@ public class PigeonTaskTest { } } - // @Test - // public void testCancelApplication() - // throws Exception { - // try { - // tisTask.cancelApplication(true); - // } catch (Exception e) { - // Assert.fail(e.getMessage()); - // } - // } + // @Test + // public void testCancelApplication() + // throws Exception { + // try { + // tisTask.cancelApplication(true); + // } catch (Exception e) { + // Assert.fail(e.getMessage()); + // } + // } } diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessor.java index a9ce868c2d..17af3e9a47 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessor.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessor.java @@ -27,7 +27,7 @@ import org.apache.dolphinscheduler.common.utils.LoggerUtils; import org.apache.dolphinscheduler.common.utils.OSUtils; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContextCacheManager; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskDispatchCommand; @@ -96,7 +96,7 @@ public class TaskDispatchProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_DISPATCH_REQUEST == command.getType(), - String.format("invalid command type : %s", command.getType())); + String.format("invalid command type : %s", command.getType())); TaskDispatchCommand taskDispatchCommand = JSONUtils.parseObject(command.getBody(), TaskDispatchCommand.class); @@ -115,7 +115,7 @@ public class TaskDispatchProcessor implements NettyRequestProcessor { } try { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId()); + taskExecutionContext.getTaskInstanceId()); TaskMetrics.incrTaskTypeExecuteCount(taskExecutionContext.getTaskType()); @@ -129,10 +129,11 @@ public class TaskDispatchProcessor implements NettyRequestProcessor { if (Constants.DRY_RUN_FLAG_NO == taskExecutionContext.getDryRun()) { boolean osUserExistFlag; - //if Using distributed is true and Currently supported systems are linux,Should not let it automatically - //create tenants,so TenantAutoCreate has no effect + // if Using distributed is true and Currently supported systems are linux,Should not let it + // automatically + // create tenants,so TenantAutoCreate has no effect if (workerConfig.isTenantDistributedUser() && SystemUtils.IS_OS_LINUX) { - //use the id command to judge in linux + // use the id command to judge in linux osUserExistFlag = OSUtils.existTenantCodeInLinux(taskExecutionContext.getTenantCode()); } else if (CommonUtils.isSudoEnable() && workerConfig.isTenantAutoCreate()) { // if not exists this user, then create @@ -145,14 +146,14 @@ public class TaskDispatchProcessor implements NettyRequestProcessor { // check if the OS user exists if (!osUserExistFlag) { logger.error("tenantCode: {} does not exist, taskInstanceId: {}", - taskExecutionContext.getTenantCode(), - taskExecutionContext.getTaskInstanceId()); + taskExecutionContext.getTenantCode(), + taskExecutionContext.getTaskInstanceId()); TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId()); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.FAILURE); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.FAILURE); taskExecutionContext.setEndTime(new Date()); workerMessageSender.sendMessageWithRetry(taskExecutionContext, - masterAddress, - CommandType.TASK_EXECUTE_RESULT); + masterAddress, + CommandType.TASK_EXECUTE_RESULT); return; } @@ -165,41 +166,41 @@ public class TaskDispatchProcessor implements NettyRequestProcessor { FileUtils.createWorkDirIfAbsent(execLocalPath); } catch (Throwable ex) { logger.error("create execLocalPath fail, path: {}, taskInstanceId: {}", - execLocalPath, - taskExecutionContext.getTaskInstanceId(), - ex); + execLocalPath, + taskExecutionContext.getTaskInstanceId(), + ex); TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId()); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.FAILURE); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.FAILURE); workerMessageSender.sendMessageWithRetry(taskExecutionContext, - masterAddress, - CommandType.TASK_EXECUTE_RESULT); + masterAddress, + CommandType.TASK_EXECUTE_RESULT); return; } } // delay task process long remainTime = DateUtils.getRemainTime(taskExecutionContext.getFirstSubmitTime(), - taskExecutionContext.getDelayTime() * 60L); + taskExecutionContext.getDelayTime() * 60L); if (remainTime > 0) { logger.info("delay the execution of task instance {}, delay time: {} s", - taskExecutionContext.getTaskInstanceId(), - remainTime); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.DELAY_EXECUTION); + taskExecutionContext.getTaskInstanceId(), + remainTime); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.DELAY_EXECUTION); taskExecutionContext.setStartTime(null); workerMessageSender.sendMessage(taskExecutionContext, masterAddress, CommandType.TASK_EXECUTE_RESULT); } // submit task to manager boolean offer = workerManager.offer(new TaskExecuteThread(taskExecutionContext, - masterAddress, - workerMessageSender, - alertClientService, - taskPluginManager, - storageOperate)); + masterAddress, + workerMessageSender, + alertClientService, + taskPluginManager, + storageOperate)); if (!offer) { logger.warn("submit task to wait queue error, queue is full, queue size is {}, taskInstanceId: {}", - workerManager.getWaitSubmitQueueSize(), - taskExecutionContext.getTaskInstanceId()); + workerManager.getWaitSubmitQueueSize(), + taskExecutionContext.getTaskInstanceId()); workerMessageSender.sendMessageWithRetry(taskExecutionContext, masterAddress, CommandType.TASK_REJECT); } } finally { diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteResultAckProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteResultAckProcessor.java index 78cb1fda72..e59902d6fc 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteResultAckProcessor.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteResultAckProcessor.java @@ -17,24 +17,20 @@ package org.apache.dolphinscheduler.server.worker.processor; +import com.google.common.base.Preconditions; +import io.netty.channel.Channel; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand; import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor; import org.apache.dolphinscheduler.server.worker.message.MessageRetryRunner; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.google.common.base.Preconditions; - -import io.netty.channel.Channel; - /** * task execute running ack, from master to worker */ @@ -49,10 +45,10 @@ public class TaskExecuteResultAckProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_EXECUTE_RESULT_ACK == command.getType(), - String.format("invalid command type : %s", command.getType())); + String.format("invalid command type : %s", command.getType())); TaskExecuteAckCommand taskExecuteAckMessage = JSONUtils.parseObject(command.getBody(), - TaskExecuteAckCommand.class); + TaskExecuteAckCommand.class); if (taskExecuteAckMessage == null) { logger.error("task execute response ack command is null"); @@ -62,17 +58,14 @@ public class TaskExecuteResultAckProcessor implements NettyRequestProcessor { try { LoggerUtils.setTaskInstanceIdMDC(taskExecuteAckMessage.getTaskInstanceId()); - if (taskExecuteAckMessage.getStatus() == ExecutionStatus.SUCCESS) { + if (taskExecuteAckMessage.isSuccess()) { messageRetryRunner.removeRetryMessage(taskExecuteAckMessage.getTaskInstanceId(), - CommandType.TASK_EXECUTE_RESULT); + CommandType.TASK_EXECUTE_RESULT); logger.debug("remove REMOTE_CHANNELS, task instance id:{}", taskExecuteAckMessage.getTaskInstanceId()); - } else if (taskExecuteAckMessage.getStatus() == ExecutionStatus.FAILURE) { + } else { // master handle worker response error, will still retry logger.error("Receive task execute result ack message, the message status is not success, message: {}", taskExecuteAckMessage); - } else { - throw new IllegalArgumentException("Invalid task execute response ack status: " - + taskExecuteAckMessage.getStatus()); } } finally { LoggerUtils.removeTaskInstanceIdMDC(); diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteRunningAckProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteRunningAckProcessor.java index 2a53355dba..a78d8c8f2a 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteRunningAckProcessor.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskExecuteRunningAckProcessor.java @@ -19,7 +19,6 @@ package org.apache.dolphinscheduler.server.worker.processor; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskExecuteRunningAckMessage; @@ -49,10 +48,10 @@ public class TaskExecuteRunningAckProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_EXECUTE_RUNNING_ACK == command.getType(), - String.format("invalid command type : %s", command.getType())); + String.format("invalid command type : %s", command.getType())); TaskExecuteRunningAckMessage runningAckCommand = JSONUtils.parseObject(command.getBody(), - TaskExecuteRunningAckMessage.class); + TaskExecuteRunningAckMessage.class); if (runningAckCommand == null) { logger.error("task execute running ack command is null"); return; @@ -61,9 +60,9 @@ public class TaskExecuteRunningAckProcessor implements NettyRequestProcessor { LoggerUtils.setTaskInstanceIdMDC(runningAckCommand.getTaskInstanceId()); logger.info("task execute running ack command : {}", runningAckCommand); - if (runningAckCommand.getStatus() == ExecutionStatus.SUCCESS) { + if (runningAckCommand.isSuccess()) { messageRetryRunner.removeRetryMessage(runningAckCommand.getTaskInstanceId(), - CommandType.TASK_EXECUTE_RUNNING); + CommandType.TASK_EXECUTE_RUNNING); } } finally { LoggerUtils.removeTaskInstanceIdMDC(); diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java index 328cb48a86..5db13f147e 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessor.java @@ -24,7 +24,7 @@ import org.apache.dolphinscheduler.plugin.task.api.AbstractTask; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContextCacheManager; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand; @@ -80,7 +80,7 @@ public class TaskKillProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_KILL_REQUEST == command.getType(), - String.format("invalid command type : %s", command.getType())); + String.format("invalid command type : %s", command.getType())); TaskKillRequestCommand killCommand = JSONUtils.parseObject(command.getBody(), TaskKillRequestCommand.class); if (killCommand == null) { logger.error("task kill request command is null"); @@ -89,8 +89,8 @@ public class TaskKillProcessor implements NettyRequestProcessor { logger.info("task kill command : {}", killCommand); int taskInstanceId = killCommand.getTaskInstanceId(); - TaskExecutionContext taskExecutionContext - = TaskExecutionContextCacheManager.getByTaskInstanceId(taskInstanceId); + TaskExecutionContext taskExecutionContext = + TaskExecutionContextCacheManager.getByTaskInstanceId(taskInstanceId); if (taskExecutionContext == null) { logger.error("taskRequest cache is null, taskInstanceId: {}", killCommand.getTaskInstanceId()); return; @@ -100,7 +100,7 @@ public class TaskKillProcessor implements NettyRequestProcessor { if (processId == 0) { this.cancelApplication(taskInstanceId); workerManager.killTaskBeforeExecuteByInstanceId(taskInstanceId); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.KILL); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.KILL); TaskExecutionContextCacheManager.removeByTaskInstanceId(taskInstanceId); sendTaskKillResponseCommand(channel, taskExecutionContext); logger.info("the task has not been executed and has been cancelled, task id:{}", taskInstanceId); @@ -110,7 +110,7 @@ public class TaskKillProcessor implements NettyRequestProcessor { Pair> result = doKill(taskExecutionContext); taskExecutionContext.setCurrentExecutionStatus( - result.getLeft() ? ExecutionStatus.SUCCESS : ExecutionStatus.FAILURE); + result.getLeft() ? TaskExecutionStatus.SUCCESS : TaskExecutionStatus.FAILURE); taskExecutionContext.setAppIds(String.join(TaskConstants.COMMA, result.getRight())); sendTaskKillResponseCommand(channel, taskExecutionContext); @@ -128,6 +128,7 @@ public class TaskKillProcessor implements NettyRequestProcessor { taskKillResponseCommand.setHost(taskExecutionContext.getHost()); taskKillResponseCommand.setProcessId(taskExecutionContext.getProcessId()); channel.writeAndFlush(taskKillResponseCommand.convert2Command()).addListener(new ChannelFutureListener() { + @Override public void operationComplete(ChannelFuture future) throws Exception { if (!future.isSuccess()) { diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java index 50abbb8f7a..a18223b90d 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java @@ -17,24 +17,20 @@ package org.apache.dolphinscheduler.server.worker.processor; +import com.google.common.base.Preconditions; +import io.netty.channel.Channel; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskRejectAckCommand; import org.apache.dolphinscheduler.remote.processor.NettyRequestProcessor; import org.apache.dolphinscheduler.server.worker.message.MessageRetryRunner; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.google.common.base.Preconditions; - -import io.netty.channel.Channel; - @Component public class TaskRejectAckProcessor implements NettyRequestProcessor { @@ -46,22 +42,22 @@ public class TaskRejectAckProcessor implements NettyRequestProcessor { @Override public void process(Channel channel, Command command) { Preconditions.checkArgument(CommandType.TASK_REJECT_ACK == command.getType(), - String.format("invalid command type : %s", command.getType())); + String.format("invalid command type : %s", command.getType())); TaskRejectAckCommand taskRejectAckMessage = JSONUtils.parseObject(command.getBody(), - TaskRejectAckCommand.class); + TaskRejectAckCommand.class); if (taskRejectAckMessage == null) { return; } try { LoggerUtils.setTaskInstanceIdMDC(taskRejectAckMessage.getTaskInstanceId()); - if (taskRejectAckMessage.getStatus() == ExecutionStatus.SUCCESS) { + if (taskRejectAckMessage.isSuccess()) { messageRetryRunner.removeRetryMessage(taskRejectAckMessage.getTaskInstanceId(), - CommandType.TASK_REJECT); + CommandType.TASK_REJECT); logger.debug("removeRecallCache: task instance id:{}", taskRejectAckMessage.getTaskInstanceId()); } else { logger.error("Receive task reject ack message, the message status is not success, message: {}", - taskRejectAckMessage); + taskRejectAckMessage); } } finally { LoggerUtils.removeTaskInstanceIdMDC(); diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java index b14172a6a7..9b7e8c7e85 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java @@ -17,22 +17,20 @@ package org.apache.dolphinscheduler.server.worker.runner; -import static org.apache.dolphinscheduler.common.Constants.SINGLE_SLASH; - +import com.google.common.base.Strings; +import lombok.NonNull; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.WarningType; import org.apache.dolphinscheduler.common.exception.StorageOperateNoConfiguredException; import org.apache.dolphinscheduler.common.storage.StorageOperate; -import org.apache.dolphinscheduler.common.utils.CommonUtils; -import org.apache.dolphinscheduler.common.utils.DateUtils; -import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.common.utils.LoggerUtils; -import org.apache.dolphinscheduler.common.utils.PropertyUtils; +import org.apache.dolphinscheduler.common.utils.*; import org.apache.dolphinscheduler.plugin.task.api.AbstractTask; import org.apache.dolphinscheduler.plugin.task.api.TaskChannel; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContextCacheManager; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.model.TaskAlertInfo; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.server.utils.ProcessUtils; @@ -41,29 +39,19 @@ import org.apache.dolphinscheduler.server.worker.rpc.WorkerMessageSender; import org.apache.dolphinscheduler.service.alert.AlertClientService; import org.apache.dolphinscheduler.service.exceptions.ServiceException; import org.apache.dolphinscheduler.service.task.TaskPluginManager; - -import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang3.tuple.Pair; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Strings; - -import lombok.NonNull; +import static org.apache.dolphinscheduler.common.Constants.SINGLE_SLASH; /** * task scheduler thread @@ -137,15 +125,15 @@ public class TaskExecuteThread implements Runnable, Delayed { public void run() { try { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId()); + taskExecutionContext.getTaskInstanceId()); if (Constants.DRY_RUN_FLAG_YES == taskExecutionContext.getDryRun()) { - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.SUCCESS); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.SUCCESS); taskExecutionContext.setStartTime(new Date()); taskExecutionContext.setEndTime(new Date()); TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId()); workerMessageSender.sendMessageWithRetry(taskExecutionContext, - masterAddress, - CommandType.TASK_EXECUTE_RESULT); + masterAddress, + CommandType.TASK_EXECUTE_RESULT); logger.info("Task dry run success"); return; } @@ -154,7 +142,7 @@ public class TaskExecuteThread implements Runnable, Delayed { } try { LoggerUtils.setWorkflowAndTaskInstanceIDMDC(taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId()); + taskExecutionContext.getTaskInstanceId()); logger.info("script path : {}", taskExecutionContext.getExecutePath()); if (taskExecutionContext.getStartTime() == null) { taskExecutionContext.setStartTime(new Date()); @@ -162,14 +150,14 @@ public class TaskExecuteThread implements Runnable, Delayed { logger.info("the task begins to execute. task instance id: {}", taskExecutionContext.getTaskInstanceId()); // callback task execute running - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.RUNNING_EXECUTION); workerMessageSender.sendMessageWithRetry(taskExecutionContext, - masterAddress, - CommandType.TASK_EXECUTE_RUNNING); + masterAddress, + CommandType.TASK_EXECUTE_RUNNING); // copy hdfs/minio file to local List> fileDownloads = downloadCheck(taskExecutionContext.getExecutePath(), - taskExecutionContext.getResources()); + taskExecutionContext.getResources()); if (!fileDownloads.isEmpty()) { downloadResource(taskExecutionContext.getExecutePath(), logger, fileDownloads); } @@ -177,12 +165,13 @@ public class TaskExecuteThread implements Runnable, Delayed { taskExecutionContext.setEnvFile(CommonUtils.getSystemEnvPath()); taskExecutionContext.setTaskAppId(String.format("%s_%s", - taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId())); + taskExecutionContext.getProcessInstanceId(), + taskExecutionContext.getTaskInstanceId())); TaskChannel taskChannel = taskPluginManager.getTaskChannelMap().get(taskExecutionContext.getTaskType()); if (null == taskChannel) { - throw new ServiceException(String.format("%s Task Plugin Not Found,Please Check Config File.", taskExecutionContext.getTaskType())); + throw new ServiceException(String.format("%s Task Plugin Not Found,Please Check Config File.", + taskExecutionContext.getTaskType())); } String taskLogName = LoggerUtils.buildTaskId(taskExecutionContext.getFirstSubmitTime(), taskExecutionContext.getProcessDefineCode(), @@ -199,7 +188,7 @@ public class TaskExecuteThread implements Runnable, Delayed { // task init this.task.init(); - //init varPool + // init varPool this.task.getParameters().setVarPool(taskExecutionContext.getVarPool()); // task handle @@ -215,27 +204,30 @@ public class TaskExecuteThread implements Runnable, Delayed { taskExecutionContext.setProcessId(this.task.getProcessId()); taskExecutionContext.setAppIds(this.task.getAppIds()); taskExecutionContext.setVarPool(JSONUtils.toJsonString(this.task.getParameters().getVarPool())); - logger.info("task instance id : {},task final status : {}", taskExecutionContext.getTaskInstanceId(), this.task.getExitStatus()); + logger.info("task instance id : {},task final status : {}", taskExecutionContext.getTaskInstanceId(), + this.task.getExitStatus()); } catch (Throwable e) { logger.error("task scheduler failure", e); kill(); - taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.FAILURE); + taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.FAILURE); taskExecutionContext.setEndTime(DateUtils.getCurrentDate()); taskExecutionContext.setProcessId(this.task.getProcessId()); taskExecutionContext.setAppIds(this.task.getAppIds()); } finally { TaskExecutionContextCacheManager.removeByTaskInstanceId(taskExecutionContext.getTaskInstanceId()); workerMessageSender.sendMessageWithRetry(taskExecutionContext, - masterAddress, - CommandType.TASK_EXECUTE_RESULT); + masterAddress, + CommandType.TASK_EXECUTE_RESULT); clearTaskExecPath(); LoggerUtils.removeWorkflowAndTaskInstanceIdMDC(); } } - private void sendAlert(TaskAlertInfo taskAlertInfo, ExecutionStatus status) { - int strategy = status == ExecutionStatus.SUCCESS ? WarningType.SUCCESS.getCode() : WarningType.FAILURE.getCode(); - alertClientService.sendAlert(taskAlertInfo.getAlertGroupId(), taskAlertInfo.getTitle(), taskAlertInfo.getContent(), strategy); + private void sendAlert(TaskAlertInfo taskAlertInfo, TaskExecutionStatus status) { + int strategy = + status == TaskExecutionStatus.SUCCESS ? WarningType.SUCCESS.getCode() : WarningType.FAILURE.getCode(); + alertClientService.sendAlert(taskAlertInfo.getAlertGroupId(), taskAlertInfo.getTitle(), + taskAlertInfo.getContent(), strategy); } /** @@ -254,7 +246,8 @@ public class TaskExecuteThread implements Runnable, Delayed { } if (SINGLE_SLASH.equals(execLocalPath)) { - logger.warn("task: {} exec local path is '/', direct deletion is not allowed", taskExecutionContext.getTaskName()); + logger.warn("task: {} exec local path is '/', direct deletion is not allowed", + taskExecutionContext.getTaskName()); return; } @@ -302,7 +295,8 @@ public class TaskExecuteThread implements Runnable, Delayed { logger.info("get resource file from path:{}", resPath); long resourceDownloadStartTime = System.currentTimeMillis(); storageOperate.download(tenantCode, resPath, execLocalPath + File.separator + fullName, false, true); - WorkerServerMetrics.recordWorkerResourceDownloadTime(System.currentTimeMillis() - resourceDownloadStartTime); + WorkerServerMetrics + .recordWorkerResourceDownloadTime(System.currentTimeMillis() - resourceDownloadStartTime); WorkerServerMetrics.recordWorkerResourceDownloadSize( Files.size(Paths.get(execLocalPath, fullName))); WorkerServerMetrics.incWorkerResourceDownloadSuccessCount(); diff --git a/dolphinscheduler-worker/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessorTest.java b/dolphinscheduler-worker/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessorTest.java index 08db9060a6..e66563c0b4 100644 --- a/dolphinscheduler-worker/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessorTest.java +++ b/dolphinscheduler-worker/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskDispatchProcessorTest.java @@ -22,7 +22,7 @@ import org.apache.dolphinscheduler.common.thread.ThreadUtils; import org.apache.dolphinscheduler.common.utils.FileUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; -import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; +import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus; import org.apache.dolphinscheduler.remote.command.Command; import org.apache.dolphinscheduler.remote.command.CommandType; import org.apache.dolphinscheduler.remote.command.TaskDispatchCommand; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; */ @RunWith(PowerMockRunner.class) @PrepareForTest({SpringApplicationContext.class, WorkerConfig.class, FileUtils.class, JsonSerializer.class, - JSONUtils.class, ThreadUtils.class, ExecutorService.class, ChannelUtils.class}) + JSONUtils.class, ThreadUtils.class, ExecutorService.class, ChannelUtils.class}) @Ignore public class TaskDispatchProcessorTest { @@ -90,12 +90,12 @@ public class TaskDispatchProcessorTest { command = new Command(); command.setType(CommandType.TASK_DISPATCH_REQUEST); ackCommand = new TaskExecuteRunningCommand("127.0.0.1:1234", - "127.0.0.1:5678", - System.currentTimeMillis()).convert2Command(); + "127.0.0.1:5678", + System.currentTimeMillis()).convert2Command(); taskRequestCommand = new TaskDispatchCommand(taskExecutionContext, - "127.0.0.1:5678", - "127.0.0.1:1234", - System.currentTimeMillis()); + "127.0.0.1:5678", + "127.0.0.1:1234", + System.currentTimeMillis()); alertClientService = PowerMockito.mock(AlertClientService.class); workerExecService = PowerMockito.mock(ExecutorService.class); PowerMockito.when(workerExecService.submit(Mockito.any(TaskExecuteThread.class))).thenReturn(null); @@ -113,42 +113,42 @@ public class TaskDispatchProcessorTest { storageOperate = PowerMockito.mock(StorageOperate.class); PowerMockito.when(workerManager.offer(new TaskExecuteThread(taskExecutionContext, - "127.0.0.1:5678", - workerMessageSender, - alertClientService, - storageOperate))).thenReturn(Boolean.TRUE); + "127.0.0.1:5678", + workerMessageSender, + alertClientService, + storageOperate))).thenReturn(Boolean.TRUE); PowerMockito.when(SpringApplicationContext.getBean(WorkerManagerThread.class)).thenReturn(workerManager); PowerMockito.mockStatic(ThreadUtils.class); PowerMockito.when(ThreadUtils.newDaemonFixedThreadExecutor("Worker-Execute-Thread", - workerConfig.getExecThreads())).thenReturn( - workerExecService); + workerConfig.getExecThreads())).thenReturn( + workerExecService); PowerMockito.mockStatic(JsonSerializer.class); PowerMockito.when(JsonSerializer.deserialize(command.getBody(), TaskDispatchCommand.class)).thenReturn( - taskRequestCommand); + taskRequestCommand); PowerMockito.mockStatic(JSONUtils.class); PowerMockito.when(JSONUtils.parseObject(command.getBody(), TaskDispatchCommand.class)).thenReturn( - taskRequestCommand); + taskRequestCommand); PowerMockito.mockStatic(FileUtils.class); PowerMockito.when(FileUtils.getProcessExecDir(taskExecutionContext.getProjectCode(), - taskExecutionContext.getProcessDefineCode(), - taskExecutionContext.getProcessDefineVersion(), - taskExecutionContext.getProcessInstanceId(), - taskExecutionContext.getTaskInstanceId())).thenReturn( - taskExecutionContext.getExecutePath()); + taskExecutionContext.getProcessDefineCode(), + taskExecutionContext.getProcessDefineVersion(), + taskExecutionContext.getProcessInstanceId(), + taskExecutionContext.getTaskInstanceId())).thenReturn( + taskExecutionContext.getExecutePath()); PowerMockito.doNothing().when(FileUtils.class, "createWorkDirIfAbsent", taskExecutionContext.getExecutePath()); SimpleTaskExecuteThread simpleTaskExecuteThread = new SimpleTaskExecuteThread(new TaskExecutionContext(), - workerMessageSender, - "127.0.0.1:5678", - LoggerFactory.getLogger( - TaskDispatchProcessorTest.class), - alertClientService, - storageOperate); + workerMessageSender, + "127.0.0.1:5678", + LoggerFactory.getLogger( + TaskDispatchProcessorTest.class), + alertClientService, + storageOperate); PowerMockito.whenNew(TaskExecuteThread.class).withAnyArguments().thenReturn(simpleTaskExecuteThread); } @@ -157,7 +157,7 @@ public class TaskDispatchProcessorTest { TaskDispatchProcessor processor = new TaskDispatchProcessor(); processor.process(null, command); - Assert.assertEquals(ExecutionStatus.RUNNING_EXECUTION, taskExecutionContext.getCurrentExecutionStatus()); + Assert.assertEquals(TaskExecutionStatus.RUNNING_EXECUTION, taskExecutionContext.getCurrentExecutionStatus()); } @Test @@ -166,7 +166,7 @@ public class TaskDispatchProcessorTest { TaskDispatchProcessor processor = new TaskDispatchProcessor(); processor.process(null, command); - Assert.assertEquals(ExecutionStatus.DELAY_EXECUTION, taskExecutionContext.getCurrentExecutionStatus()); + Assert.assertEquals(TaskExecutionStatus.DELAY_EXECUTION, taskExecutionContext.getCurrentExecutionStatus()); } public TaskExecutionContext getTaskExecutionContext() {