You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2024/08/26 07:19:44 UTC
(dolphinscheduler) branch dev updated: [DSIP-61][Master] Refactor thread pool and state event orchestration in master (#16327)
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 9448806af0 [DSIP-61][Master] Refactor thread pool and state event orchestration in master (#16327)
9448806af0 is described below
commit 9448806af0ca09934037d0c76b4096add3c80c80
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Mon Aug 26 15:19:39 2024 +0800
[DSIP-61][Master] Refactor thread pool and state event orchestration in master (#16327)
---
.github/workflows/unit-test.yml | 2 +-
docs/docs/en/guide/project/workflow-instance.md | 55 +-
.../alert/plugin/AlertPluginManager.java | 6 +-
.../api/test/cases/ExecutorAPITest.java | 8 -
.../api/test/cases/ProcessInstanceAPITest.java | 23 +-
.../api/test/pages/workflow/ExecutorPage.java | 19 +-
.../api/controller/ExecutorController.java | 425 ++---
.../api/controller/ProcessInstanceController.java | 4 +
.../v2/WorkflowInstanceV2Controller.java | 10 +-
.../api/dto/workflow/WorkflowBackFillRequest.java | 96 +
.../api/dto/workflow/WorkflowTriggerRequest.java | 66 +
.../api/exceptions/ApiExceptionHandler.java | 2 +-
.../api/executor/ExecuteClient.java | 62 -
.../api/executor/ExecuteContext.java | 51 -
.../api/executor/ExecuteFunctionBuilder.java | 32 -
.../api/executor/ExecuteRuntimeException.java | 46 -
.../workflow/BackfillWorkflowExecutorDelegate.java | 139 ++
.../api/executor/workflow/ExecutorClient.java | 79 +
.../api/executor/workflow/IExecutorDelegate.java | 8 +-
.../PauseWorkflowInstanceExecutorDelegate.java | 128 ++
...RecoverFailureTaskInstanceExecutorDelegate.java | 91 +
...rSuspendedWorkflowInstanceExecutorDelegate.java | 87 +
...eatRunningWorkflowInstanceExecutorDelegate.java | 88 +
.../StopWorkflowInstanceExecutorDelegate.java | 129 ++
.../workflow/TriggerWorkflowExecutorDelegate.java | 71 +
.../recovery/FailureRecoveryExecuteFunction.java | 64 -
.../FailureRecoveryExecuteFunctionBuilder.java | 59 -
.../instance/pause/pause/PauseExecuteFunction.java | 79 -
.../pause/pause/PauseExecuteFunctionBuilder.java | 57 -
.../instance/pause/pause/PauseExecuteRequest.java | 35 -
.../instance/pause/pause/PauseExecuteResult.java | 29 -
.../pause/recover/RecoverExecuteFunction.java | 78 -
.../recover/RecoverExecuteFunctionBuilder.java | 60 -
.../rerun/RepeatRunningExecuteFunction.java | 93 -
.../rerun/RepeatRunningExecuteFunctionBuilder.java | 59 -
.../instance/stop/StopExecuteFunction.java | 83 -
.../instance/stop/StopExecuteFunctionBuilder.java | 53 -
.../workflow/instance/stop/StopResult.java | 33 -
.../dolphinscheduler/api/python/PythonGateway.java | 33 +-
.../api/service/ExecutorService.java | 122 +-
.../api/service/impl/ExecutorServiceImpl.java | 628 +------
.../dolphinscheduler/api/utils/WorkflowUtils.java | 63 +
.../validator/workflow/BackfillWorkflowDTO.java | 101 +
.../workflow/BackfillWorkflowDTOValidator.java | 43 +-
.../BackfillWorkflowRequestTransformer.java | 127 ++
.../api/validator/workflow/TriggerWorkflowDTO.java | 78 +
.../workflow/TriggerWorkflowDTOValidator.java | 24 +-
.../TriggerWorkflowRequestTransformer.java | 70 +
...flowInstanceExecuteFunctionControllerTest.java} | 79 +-
.../v2/WorkflowInstanceV2ControllerTest.java | 5 +-
.../dolphinscheduler/api/enums/StatusTest.java | 2 +
.../StopWorkflowInstanceExecuteFunctionTest.java | 105 ++
...qWorkflowInstanceExecuteResultServiceTest.java} | 4 +-
.../api/service/ExecuteFunctionServiceTest.java | 703 -------
.../api/service/ProcessInstanceServiceTest.java | 12 +-
...WorkflowInstanceExecuteFunctionServiceTest.java | 699 +++++++
.../dolphinscheduler/common/enums/CommandType.java | 52 +-
.../apache/dolphinscheduler/common/enums/Flag.java | 7 +
.../common/enums/ProcessExecutionTypeEnum.java | 17 +-
.../common/enums/StateEventType.java | 5 +-
.../common/enums/WorkflowExecutionStatus.java | 33 +-
.../thread/DefaultUncaughtExceptionHandler.java | 5 +-
.../common/thread/ThreadUtils.java | 27 +-
.../dolphinscheduler/common/utils/DateUtils.java | 5 +
.../common/thread/ThreadUtilsTest.java | 16 +-
.../org/apache/dolphinscheduler/dao/AlertDao.java | 3 +-
.../dao/entity/ProcessInstance.java | 7 +
.../dao/entity/ProcessTaskRelation.java | 6 +
.../dolphinscheduler/dao/entity/Schedule.java | 6 +
.../dao/entity/TaskDefinition.java | 10 +-
.../dao/mapper/ProcessInstanceMapper.java | 30 +-
.../dao/mapper/TaskInstanceMapper.java | 4 +
.../dao/repository/ProcessInstanceDao.java | 21 +-
.../dao/repository/ProjectDao.java | 2 +
.../dao/repository/TaskInstanceDao.java | 25 +-
.../repository/impl/ProcessInstanceDaoImpl.java | 33 +-
.../dao/repository/impl/ProjectDaoImpl.java | 5 +
.../dao/repository/impl/TaskInstanceDaoImpl.java | 19 +
.../dao/mapper/ProcessInstanceMapper.xml | 6 +-
.../dao/mapper/ProcessTaskLineageMapper.xml | 16 -
.../dao/mapper/TaskInstanceMapper.xml | 6 +
.../dao/mapper/ProcessInstanceMapperTest.java | 6 +-
.../impl/ProcessInstanceDaoImplTest.java | 38 +-
.../api/plugin/DataSourceProcessorManager.java | 4 +-
dolphinscheduler-eventbus/pom.xml | 32 +
.../eventbus/AbstractDelayEvent.java | 56 +
.../eventbus/AbstractDelayEventBus.java | 42 +-
.../apache/dolphinscheduler/eventbus/IEvent.java | 7 +-
.../dolphinscheduler/eventbus/IEventBus.java | 31 +-
.../client/JdkDynamicRpcClientProxyFactory.java | 14 +-
.../SingletonJdkDynamicRpcClientProxyFactory.java | 21 +
...tener.java => ITaskExecutionEventListener.java} | 27 +-
...kOperator.java => ITaskInstanceController.java} | 11 +-
...tener.java => IWorkflowInstanceController.java} | 24 +-
.../extract/master/IWorkflowInstanceService.java | 9 -
.../AbstractCommandParam.java} | 22 +-
.../BackfillWorkflowCommandParam.java} | 28 +-
.../extract/master/command/ICommandParam.java | 65 +
.../master/command/ReRunWorkflowCommandParam.java} | 25 +-
.../RecoverFailureTaskCommandParam.java} | 22 +-
.../RunWorkflowCommandParam.java} | 21 +-
.../ScheduleWorkflowCommandParam.java} | 21 +-
.../command/WorkflowFailoverCommandParam.java | 36 +-
...xecutionEvent.java => ITaskExecutionEvent.java} | 14 +-
...oEvent.java => TaskExecutionDispatchEvent.java} | 18 +-
...nfoEvent.java => TaskExecutionFailedEvent.java} | 18 +-
...nfoEvent.java => TaskExecutionKilledEvent.java} | 18 +-
...nfoEvent.java => TaskExecutionPausedEvent.java} | 18 +-
...ngEvent.java => TaskExecutionRunningEvent.java} | 4 +-
...shEvent.java => TaskExecutionSuccessEvent.java} | 16 +-
... TaskGroupSlotAcquireSuccessNotifyRequest.java} | 8 +-
...TaskGroupSlotAcquireSuccessNotifyResponse.java} | 11 +-
.../transportor/WorkflowInstancePauseRequest.java | 10 +-
...nse.java => WorkflowInstancePauseResponse.java} | 14 +-
.../WorkflowInstanceStateChangeEvent.java | 60 -
.../transportor/WorkflowInstanceStopRequest.java | 10 +-
...onse.java => WorkflowInstanceStopResponse.java} | 14 +-
.../ITaskInstanceExecutionEventAckListener.java | 20 +-
.../extract/worker/ITaskInstanceOperator.java | 12 +-
...owHostRequest.java => TakeOverTaskRequest.java} | 4 +-
...HostResponse.java => TakeOverTaskResponse.java} | 10 +-
...ntAck.java => TaskExecutionFailedEventAck.java} | 12 +-
...ntAck.java => TaskExecutionKilledEventAck.java} | 12 +-
...ntAck.java => TaskExecutionPausedEventAck.java} | 12 +-
...tAck.java => TaskExecutionSuccessEventAck.java} | 12 +-
...> TaskInstanceExecutionDispatchedEventAck.java} | 13 +-
.../transportor/TaskInstanceKillResponse.java | 1 +
dolphinscheduler-master/pom.xml | 19 +
.../server/master/MasterServer.java | 44 +-
.../cache/ProcessInstanceExecCacheManager.java | 70 -
.../cache/StreamTaskInstanceExecCacheManager.java | 51 -
.../StreamTaskInstanceExecCacheManagerImpl.java | 73 -
.../master/cluster/ClusterStateMonitors.java | 17 +-
.../server/master/cluster/MasterSlotManager.java | 8 +-
.../server/master/config/MasterConfig.java | 59 +-
.../controller/WorkflowExecuteController.java | 52 -
.../AbstractLifecycleEvent.java} | 16 +-
.../ILifecycleEventHandler.java} | 18 +-
.../server/master/engine/ILifecycleEventType.java | 5 +-
.../server/master/engine/IWorkflowRepository.java | 26 +-
.../taskgroup => engine}/TaskGroupCoordinator.java | 59 +-
.../WorkflowCacheRepository.java} | 41 +-
.../server/master/engine/WorkflowEngine.java | 66 +
.../server/master/engine/WorkflowEventBus.java | 77 +
.../master/engine/WorkflowEventBusCoordinator.java | 80 +
.../master/engine/WorkflowEventBusFireWorker.java | 143 ++
.../master/engine/WorkflowEventBusFireWorkers.java | 87 +
.../command/CommandEngine.java} | 119 +-
.../command/CommandFetcherConfiguration.java | 2 +-
.../{ => engine}/command/ICommandFetcher.java | 2 +-
.../master/engine/command/ICommandHandler.java | 47 +
.../command/IdSlotBasedCommandFetcher.java | 5 +-
.../command/handler/AbstractCommandHandler.java | 152 ++
.../handler/BackfillWorkflowCommandHandler.java | 57 +
.../handler/ReRunWorkflowCommandHandler.java | 101 +
.../handler/RecoverFailureTaskCommandHandler.java | 218 +++
.../RecoverSuspendWorkflowCommandHandler.java} | 20 +-
.../command/handler/RunWorkflowCommandHandler.java | 185 ++
.../handler/ScheduleWorkflowCommandHandler.java | 52 +
.../handler/WorkflowFailoverCommandHandler.java | 148 ++
.../CommandDuplicateHandleException.java | 11 +-
.../exceptions/TaskKillException.java} | 11 +-
.../exceptions/TaskPauseException.java} | 11 +-
.../exceptions/WorkflowEventFireException.java} | 12 +-
...wExecutionGraphInitializeFailureException.java} | 18 +-
.../engine/graph/IWorkflowExecutionGraph.java | 204 ++
.../server/master/engine/graph/IWorkflowGraph.java | 59 +
.../master/engine/graph/SuccessorFlowAdjuster.java | 143 ++
.../engine/graph/WorkflowExecutionGraph.java | 310 +++
.../server/master/engine/graph/WorkflowGraph.java | 150 ++
.../engine/graph/WorkflowGraphBfsVisitor.java | 165 ++
.../master/engine/graph/WorkflowGraphFactory.java | 57 +
.../master/engine/system/SystemEventBus.java | 60 +
.../engine/system/SystemEventBusFireWorker.java | 102 +
.../system/event/AbstractSystemEvent.java} | 18 +-
.../system/event/GlobalMasterFailoverEvent.java | 35 +-
.../event/GlobalMasterFailoverEventHandler.java} | 22 +-
.../engine/system/event/ISystemEventHandler.java | 7 +-
.../engine/system/event/MasterFailoverEvent.java | 57 +
.../system/event/MasterFailoverEventHandler.java} | 24 +-
.../engine/system/event/SystemEventType.java | 23 +-
.../engine/system/event/WorkerFailoverEvent.java | 57 +
.../system/event/WorkerFailoverEventHandler.java} | 25 +-
.../engine/task/client/ITaskExecutorClient.java | 48 +
.../task/client/ITaskExecutorClientDelegator.java} | 17 +-
.../task/client/ITaskOperator.java} | 31 +-
.../client/LogicTaskExecutorClientDelegator.java | 82 +
.../PhysicalTaskExecutorClientDelegator.java | 81 +
.../engine/task/client/TaskExecutorClient.java | 70 +
.../task/lifecycle/AbstractTaskLifecycleEvent.java | 25 +-
.../task/lifecycle/TaskLifecycleEventType.java | 79 +
.../event/TaskDispatchLifecycleEvent.java | 49 +
.../event/TaskDispatchedLifecycleEvent.java | 50 +
.../lifecycle/event/TaskFailedLifecycleEvent.java | 52 +
.../event/TaskFailoverLifecycleEvent.java | 48 +
.../lifecycle/event/TaskKillLifecycleEvent.java | 49 +
.../lifecycle/event/TaskKilledLifecycleEvent.java | 56 +
.../lifecycle/event/TaskPauseLifecycleEvent.java | 49 +
.../lifecycle/event/TaskPausedLifecycleEvent.java | 49 +
.../lifecycle/event/TaskRetryLifecycleEvent.java | 71 +
.../lifecycle/event/TaskRunningLifecycleEvent.java | 57 +
.../lifecycle/event/TaskStartLifecycleEvent.java | 49 +
.../lifecycle/event/TaskSuccessLifecycleEvent.java | 55 +
.../lifecycle/event/TaskTimeoutLifecycleEvent.java | 69 +
.../handler/AbstractTaskLifecycleEventHandler.java | 58 +
.../handler/TaskDispatchLifecycleEventHandler.java | 47 +
.../TaskDispatchedLifecycleEventHandler.java | 49 +
.../handler/TaskFailedLifecycleEventHandler.java | 44 +
.../handler/TaskFailoverLifecycleEventHandler.java | 44 +
.../handler/TaskKillLifecycleEventHandler.java | 47 +
.../handler/TaskKilledLifecycleEventHandler.java | 44 +
.../handler/TaskPauseLifecycleEventHandler.java | 47 +
.../handler/TaskPausedLifecycleEventHandler.java | 44 +
.../handler/TaskRetryLifecycleEventHandler.java | 47 +
.../handler/TaskRunningLifecycleEventHandler.java | 48 +
.../handler/TaskStartLifecycleEventHandler.java | 75 +
.../handler/TaskSuccessLifecycleEventHandler.java | 44 +
.../handler/TaskTimeoutLifecycleEventHandler.java | 99 +
.../ITaskExecutionRunnableLifecycleListener.java | 45 +
.../task/runnable/AbstractTaskInstanceFactory.java | 131 ++
.../task/runnable/FailoverTaskInstanceFactory.java | 83 +
.../task/runnable/FirstRunTaskInstanceFactory.java | 98 +
.../task/runnable/ITaskExecutionRunnable.java} | 32 +-
.../task/runnable/ITaskInstanceFactory.java} | 18 +-
.../task/runnable/RetryTaskInstanceFactory.java | 87 +
.../runnable}/TaskExecutionContextBuilder.java | 6 +-
.../TaskExecutionContextCreateRequest.java | 21 +-
.../task/runnable/TaskExecutionRunnable.java | 164 ++
.../runnable/TaskExecutionRunnableBuilder.java | 26 +-
.../task/runnable/TaskInstanceFactories.java} | 26 +-
.../task/statemachine/AbstractTaskStateAction.java | 310 +++
.../engine/task/statemachine/ITaskStateAction.java | 153 ++
.../TaskDelayExecutionStateAction.java} | 24 +-
.../task/statemachine/TaskDispatchStateAction.java | 152 ++
.../task/statemachine/TaskFailoverStateAction.java | 148 ++
.../task/statemachine/TaskFailureStateAction.java | 183 ++
.../statemachine/TaskForceSuccessStateAction.java} | 20 +-
.../task/statemachine/TaskKillStateAction.java | 145 ++
.../task/statemachine/TaskPauseStateAction.java | 145 ++
.../task/statemachine/TaskRunningStateAction.java | 145 ++
.../task/statemachine/TaskStateActionFactory.java | 48 +
.../statemachine/TaskSubmittedStateAction.java | 196 ++
.../task/statemachine/TaskSuccessStateAction.java | 152 ++
.../AbstractWorkflowLifecycleLifecycleEvent.java | 25 +-
.../lifecycle/WorkflowLifecycleEventType.java | 61 +
.../event/WorkflowFailedLifecycleEvent.java | 53 +
.../event/WorkflowFinalizeLifecycleEvent.java | 58 +
.../event/WorkflowPauseLifecycleEvent.java | 50 +
.../event/WorkflowPausedLifecycleEvent.java | 53 +
.../event/WorkflowStartLifecycleEvent.java | 50 +
.../event/WorkflowStopLifecycleEvent.java | 50 +
.../event/WorkflowStoppedLifecycleEvent.java | 50 +
.../event/WorkflowSucceedLifecycleEvent.java | 48 +
...icalTransitionWithTaskFinishLifecycleEvent.java | 72 +
.../AbstractWorkflowLifecycleEventHandler.java | 82 +
.../WorkflowFailedLifecycleEventHandler.java | 47 +
.../WorkflowFinalizeLifecycleEventHandler.java | 61 +
.../WorkflowPauseLifecycleEventHandler.java | 49 +
.../WorkflowPausedLifecycleEventHandler.java | 44 +
.../WorkflowStartLifecycleEventHandler.java | 48 +
.../handler/WorkflowStopLifecycleEventHandler.java | 47 +
.../WorkflowStoppedLifecycleEventHandler.java | 47 +
.../WorkflowSucceedLifecycleEventHandler.java | 47 +
...nsitionWithTaskFinishLifecycleEventHandler.java | 47 +
.../listener/IWorkflowLifecycleListener.java} | 17 +-
.../listener/WorkflowSuccessLifecycleListener.java | 110 ++
.../runnable/IWorkflowExecutionRunnable.java | 77 +
.../runnable/WorkflowExecutionRunnable.java | 102 +
.../runnable/WorkflowExecutionRunnableBuilder.java | 14 +-
.../runnable/WorkflowExecutionRunnableFactory.java | 89 +
.../statemachine/AbstractWorkflowStateAction.java | 172 ++
.../statemachine/IWorkflowStateAction.java | 107 ++
.../statemachine/WorkflowFailedStateAction.java | 118 ++
.../statemachine/WorkflowFailoverStateAction.java | 121 ++
.../statemachine/WorkflowPausedStateAction.java | 118 ++
.../WorkflowReadyPauseStateAction.java | 143 ++
.../statemachine/WorkflowReadyStopStateAction.java | 143 ++
.../statemachine/WorkflowRunningStateAction.java | 178 ++
.../WorkflowSerialWaitStateAction.java | 121 ++
.../statemachine/WorkflowStateActionFactory.java | 51 +
.../statemachine/WorkflowStoppedStateAction.java | 118 ++
.../statemachine/WorkflowSuccessStateAction.java | 118 ++
.../statemachine/WorkflowWaitToRunStateAction.java | 117 ++
.../server/master/event/StateEventHandler.java | 36 -
.../master/event/StateEventHandlerManager.java | 47 -
.../server/master/event/TaskCacheEventHandler.java | 109 --
.../server/master/event/TaskDelayEventHandler.java | 127 --
.../master/event/TaskDispatchEventHandler.java | 87 -
.../server/master/event/TaskEventHandler.java | 34 -
.../master/event/TaskResultEventHandler.java | 139 --
.../master/event/TaskRetryStateEventHandler.java | 55 -
.../master/event/TaskRunningEventHandler.java | 123 --
.../server/master/event/TaskStateEvent.java | 53 -
.../server/master/event/TaskStateEventHandler.java | 108 --
.../master/event/TaskTimeoutStateEventHandler.java | 84 -
.../master/event/TaskUpdatePidEventHandler.java | 107 --
.../server/master/event/WorkflowEventHandler.java | 31 -
.../master/event/WorkflowStartEventHandler.java | 88 -
.../master/event/WorkflowStateEventHandler.java | 100 -
.../event/WorkflowSubmitFailStateEventHandler.java | 73 -
.../event/WorkflowTimeoutStateEventHandler.java | 48 -
.../master/failover/FailoverCoordinator.java | 169 ++
.../master/failover/IFailoverCoordinator.java | 50 +
.../TaskFailover.java} | 16 +-
.../server/master/failover/WorkflowFailover.java | 70 +
.../server/master/graph/WorkflowGraph.java | 69 -
.../server/master/graph/WorkflowGraphFactory.java | 132 --
.../processor/queue/StateEventResponseService.java | 160 --
.../server/master/processor/queue/TaskEvent.java | 158 --
.../master/processor/queue/TaskEventService.java | 153 --
.../processor/queue/TaskExecuteRunnable.java | 103 -
.../processor/queue/TaskExecuteThreadPool.java | 137 --
.../{task => registry}/MasterHeartBeatTask.java | 2 +-
.../master/registry/MasterRegistryClient.java | 75 -
.../registry/MasterRegistryDataListener.java | 84 -
.../master/registry/MasterWaitingStrategy.java | 15 +-
...ogicITaskInstanceDispatchOperationFunction.java | 6 +-
.../master/rpc/StreamingTaskOperatorImpl.java | 58 -
.../master/rpc/TaskExecutionEventListenerImpl.java | 210 +++
.../master/rpc/TaskInstanceControllerImpl.java | 73 +
.../master/rpc/TaskInstanceListenerImpl.java | 64 -
.../rpc/TaskInstanceWakeupOperationFunction.java | 68 -
.../master/rpc/WorkflowInstanceControllerImpl.java | 81 +
.../master/rpc/WorkflowInstanceServiceImpl.java | 25 -
.../master/runner/BaseTaskExecuteRunnable.java | 83 -
.../master/runner/DefaultTaskExecuteRunnable.java | 58 -
.../server/master/runner/EventExecuteService.java | 102 -
.../master/runner/FailoverExecuteThread.java | 76 -
.../runner/GlobalTaskDispatchWaitingQueue.java | 43 +-
.../GlobalTaskDispatchWaitingQueueLooper.java | 62 +-
.../master/runner/IWorkflowExecuteContext.java | 17 +-
.../master/runner/StateWheelExecuteThread.java | 368 ----
.../master/runner/StreamTaskExecuteRunnable.java | 447 -----
.../master/runner/StreamTaskExecuteThreadPool.java | 77 -
.../master/runner/TaskExecuteRunnableFactory.java | 14 +-
.../master/runner/TaskExecutionContextFactory.java | 30 +-
.../server/master/runner/WorkflowEventLooper.java | 126 --
.../master/runner/WorkflowExecuteContext.java | 79 +-
.../runner/WorkflowExecuteContextFactory.java | 73 -
.../master/runner/WorkflowExecuteRunnable.java | 1972 --------------------
.../runner/WorkflowExecuteRunnableFactory.java | 97 -
.../master/runner/WorkflowExecuteThreadPool.java | 134 --
.../runner/dispatcher/BaseTaskDispatcher.java | 29 +-
.../runner/dispatcher/MasterTaskDispatcher.java | 26 +-
.../master/runner/dispatcher/TaskDispatcher.java | 5 +-
.../runner/dispatcher/WorkerTaskDispatcher.java | 18 +-
.../execute/DefaultTaskExecuteRunnableFactory.java | 62 -
.../master/runner/execute/MasterTaskExecutor.java | 39 +-
.../runner/execute/MasterTaskExecutorHolder.java | 5 +
.../MasterTaskExecutorThreadPoolManager.java | 16 +-
.../ITaskInstanceExecutionEventListenFunction.java | 24 -
...tanceExecutionEventListenerFunctionManager.java | 57 -
...InstanceExecutionResultEventListenFunction.java | 52 -
...nstanceExecutionRunningEventListenFunction.java | 43 -
.../TaskInstanceStateEventListenFunction.java | 83 -
...ogicTaskInstanceExecuteDispatchEventSender.java | 53 +
...LogicTaskInstanceExecuteRunningEventSender.java | 23 +-
...gicTaskInstanceExecutionEventSenderManager.java | 36 +-
...ogicTaskInstanceExecutionFailedEventSender.java | 51 +
...ogicTaskInstanceExecutionFinishEventSender.java | 59 -
...ogicTaskInstanceExecutionKilledEventSender.java | 51 +
...ogicTaskInstanceExecutionPausedEventSender.java | 51 +
...gicTaskInstanceExecutionSuccessEventSender.java | 54 +
.../BaseTaskExecuteRunnableDispatchOperator.java | 58 -
.../BaseTaskExecuteRunnableKillOperator.java | 62 -
.../BaseTaskExecuteRunnableTimeoutOperator.java | 71 -
.../LogicTaskExecuteRunnableKillOperator.java | 56 -
.../LogicTaskExecuteRunnablePauseOperator.java | 52 -
.../LogicTaskExecuteRunnableTimeoutOperator.java | 59 -
.../operator/TaskExecuteRunnableKillOperator.java | 54 -
.../TaskExecuteRunnableOperatorManager.java | 82 -
.../operator/TaskExecuteRunnablePauseOperator.java | 59 -
.../TaskExecuteRunnableTimeoutOperator.java | 57 -
.../master/runner/task/BaseSyncLogicTask.java | 20 +-
.../server/master/runner/task/TaskInstanceKey.java | 44 -
.../runner/task/condition/ConditionLogicTask.java | 9 +-
.../condition/ConditionLogicTaskPluginFactory.java | 15 +-
.../runner/task/dependent/DependentLogicTask.java | 17 +-
.../dependent/DependentLogicTaskPluginFactory.java | 15 +-
.../runner/task/dynamic/DynamicLogicTask.java | 65 +-
.../master/runner/task/fake/LogicFakeTask.java | 84 +
.../LogicFakeTaskPluginFactory.java} | 35 +-
.../SubWorkflowAsyncTaskExecuteFunction.java | 15 +-
.../task/subworkflow/SubWorkflowLogicTask.java | 208 ++-
.../SubWorkflowLogicTaskPluginFactory.java | 20 +-
.../SubWorkflowLogicTaskRuntimeContext.java | 16 +-
.../runner/task/switchtask/SwitchLogicTask.java | 36 +-
.../switchtask/SwitchLogicTaskPluginFactory.java | 16 +-
.../server/master/service/ExecutingService.java | 75 -
.../server/master/service/FailoverService.java | 63 -
.../master/service/MasterFailoverService.java | 204 --
.../master/service/WorkerFailoverService.java | 286 ---
.../master/utils/DataQualityResultOperator.java | 293 ++-
.../ExceptionUtils.java} | 10 +-
.../TaskGroupUtils.java} | 23 +-
.../server/master/utils/WorkflowInstanceUtils.java | 76 +-
.../src/main/resources/application.yaml | 20 +-
.../master/AbstractMasterIntegrationTest.java | 50 +
.../server/master/BlockingTaskTest.java | 245 ---
.../server/master/ConditionsTaskTest.java | 159 --
.../server/master/DependentTaskTest.java | 440 -----
.../server/master/MasterMessageTest.java | 100 -
.../server/master/SubProcessTaskTest.java | 162 --
.../server/master/SwitchTaskTest.java | 131 --
.../ProcessInstanceExecCacheManagerImplTest.java | 79 -
.../server/master/config/MasterConfigTest.java | 14 +-
.../master/event/TaskCacheEventHandlerTest.java | 112 --
.../server/master/it/Repository.java | 68 +
.../server/master/it/WorkflowITContext.java | 26 +-
.../server/master/it/WorkflowITContextFactory.java | 135 ++
.../server/master/it/WorkflowOperator.java | 136 ++
.../server/master/it/YamlFactory.java | 45 +-
.../server/master/it/cases/WorkflowBackfillIT.java | 104 ++
.../it/cases/WorkflowInstanceFailoverIT.java | 600 ++++++
.../master/it/cases/WorkflowInstancePauseIT.java | 210 +++
.../master/it/cases/WorkflowInstanceStopIT.java | 195 ++
.../master/it/cases/WorkflowSchedulingIT.java | 116 ++
.../server/master/it/cases/WorkflowStartIT.java | 521 ++++++
.../master/registry/MasterRegistryClientTest.java | 112 --
.../GlobalTaskDispatchWaitingQueueLooperTest.java | 44 +-
.../runner/GlobalTaskDispatchWaitingQueueTest.java | 118 +-
.../master/runner/MasterTaskExecThreadTest.java | 99 -
.../master/runner/WorkflowExecuteRunnableTest.java | 400 ----
.../dispatcher/MasterTaskDispatcherTest.java | 8 +-
.../dispatcher/WorkerTaskDispatcherTest.java | 9 +-
.../runner/taskgroup/TaskGroupCoordinatorTest.java | 8 +-
.../server/master/service/FailoverServiceTest.java | 209 ---
.../master/utils/WorkflowInstanceUtilsTest.java | 40 +-
.../src/test/resources/application.yaml | 83 +-
.../workflow_with_one_fake_task_success.yaml | 61 +
...flowInstance_with_one_dispatched_fake_task.yaml | 108 ++
...workflowInstance_with_one_failed_fake_task.yaml | 109 ++
...workflowInstance_with_one_paused_fake_task.yaml | 109 ++
...kflowInstance_with_one_submitted_fake_task.yaml | 108 ++
...orkflowInstance_with_one_success_fake_task.yaml | 109 ++
...flowInstance_with_one_dispatched_fake_task.yaml | 108 ++
...workflowInstance_with_one_failed_fake_task.yaml | 109 ++
...workflowInstance_with_one_killed_fake_task.yaml | 109 ++
...kflowInstance_with_one_submitted_fake_task.yaml | 108 ++
...orkflowInstance_with_one_success_fake_task.yaml | 109 ++
...flowInstance_with_one_dispatched_fake_task.yaml | 108 ++
...workflowInstance_with_one_failed_fake_task.yaml | 111 ++
...orkflowInstance_with_one_running_fake_task.yaml | 110 ++
...kflowInstance_with_one_submitted_fake_task.yaml | 108 ++
...orkflowInstance_with_one_success_fake_task.yaml | 111 ++
.../pause/workflow_with_one_fake_task_failed.yaml | 61 +
.../pause/workflow_with_one_fake_task_success.yaml | 61 +
...ith_three_parallel_three_fake_task_success.yaml | 221 +++
.../workflow_with_one_fake_task_success.yaml | 61 +
.../it/start/workflow_with_global_param.yaml | 84 +
.../start/workflow_with_one_fake_task_failed.yaml | 61 +
...kflow_with_one_fake_task_failed_with_retry.yaml | 63 +
.../start/workflow_with_one_fake_task_success.yaml | 61 +
...ith_three_parallel_three_fake_task_success.yaml | 221 +++
...orkflow_with_two_parallel_fake_task_failed.yaml | 81 +
...rkflow_with_two_parallel_fake_task_success.yaml | 81 +
.../workflow_with_two_serial_fake_task_failed.yaml | 81 +
...workflow_with_two_serial_fake_task_success.yaml | 80 +
.../stop/workflow_with_one_fake_task_failed.yaml | 61 +
.../stop/workflow_with_one_fake_task_success.yaml | 61 +
...ith_three_parallel_three_fake_task_success.yaml | 221 +++
.../src/test/resources/logback.xml | 10 +-
.../registry/api/enums/RegistryNodeType.java | 4 +-
.../registry/jdbc/JdbcRegistryThreadFactory.java | 8 +-
.../scheduler/quartz/ProcessScheduleTask.java | 7 +
.../service/alert/ProcessAlertManager.java | 3 +-
.../service/command/CommandService.java | 11 -
.../service/command/CommandServiceImpl.java | 62 -
.../service/expand/CuringParamsServiceImpl.java | 41 +-
.../service/process/ProcessService.java | 9 -
.../service/process/ProcessServiceImpl.java | 117 --
.../dolphinscheduler/service/utils/Constants.java | 2 -
.../service/command/MessageServiceImplTest.java | 44 -
.../service/expand/CuringParamsServiceTest.java | 30 +-
.../service/process/ProcessServiceTest.java | 270 ---
.../dolphinscheduler/spi/enums/CommandType.java | 85 -
.../src/main/resources/application.yaml | 13 -
.../plugin/task/api/TaskExecutionContext.java | 2 +
.../plugin/task/api/TaskPluginManager.java | 5 +-
.../plugin/task/api/enums/TaskExecutionStatus.java | 9 +-
.../plugin/task/api/log/TaskInstanceLogHeader.java | 60 +-
.../plugin/task/api/model/Property.java | 16 +-
.../api/parameters/LogicFakeTaskParameters.java | 25 +-
.../shell/BaseLinuxShellInterceptorBuilder.java | 10 +-
.../plugin/task/api/task/LogicFakeTaskChannel.java | 19 +-
.../task/api/task/LogicFakeTaskChannelFactory.java | 25 +-
.../plugin/task/api/utils/TaskTypeUtils.java | 5 +
.../parameters/LogicFakeTaskParametersTest.java | 47 +
.../plugin/task/java/JavaTask.java | 2 +-
.../src/service/modules/executors/index.ts | 19 +-
dolphinscheduler-worker/pom.xml | 6 +
.../server/worker/message/MessageRetryRunner.java | 24 +-
.../message/TaskExecutionDispatchEventSender.java | 55 +
.../message/TaskExecutionFailedEventSender.java | 56 +
.../message/TaskExecutionKilledEventSender.java | 56 +
.../message/TaskExecutionPausedEventSender.java | 56 +
.../message/TaskExecutionSuccessEventSender.java | 59 +
.../message/TaskInstanceExecutionEventSender.java | 6 +-
.../TaskInstanceExecutionFinishEventSender.java | 65 -
...TaskInstanceExecutionInfoUpdateEventSender.java | 59 -
.../TaskInstanceExecutionRunningEventSender.java | 26 +-
.../TaskInstanceExecutionEventAckListenerImpl.java | 108 +-
.../worker/rpc/TaskInstanceOperatorImpl.java | 17 +-
.../server/worker/rpc/WorkerMessageSender.java | 33 +-
.../server/worker/runner/TaskCallbackImpl.java | 6 +-
.../server/worker/runner/WorkerTaskExecutor.java | 34 +-
.../runner/WorkerTaskExecutorThreadPool.java | 15 +-
...anceExecutionEventAckListenFunctionManager.java | 59 -
...tanceExecutionFinishEventAckListenFunction.java | 60 -
...nstanceExecutionInfoEventAckListenFunction.java | 61 -
...anceExecutionRunningEventAckListenFunction.java | 58 -
...ion.java => TakeOverTaskOperationFunction.java} | 22 +-
.../TaskInstanceDispatchOperationFunction.java | 7 +-
.../TaskInstanceKillOperationFunction.java | 2 +-
.../TaskInstanceOperationFunctionManager.java | 10 +-
.../TaskInstancePauseOperationFunction.java | 2 +-
.../runner/WorkerTaskExecutorThreadPoolTest.java | 11 +-
...nstanceExecutionEventAckListenFunctionTest.java | 104 --
.../TaskInstanceOperationFunctionTest.java | 24 +-
pom.xml | 1 +
520 files changed, 22085 insertions(+), 16337 deletions(-)
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 175fbdd83a..d5cd09d87f 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -111,7 +111,7 @@ jobs:
result:
name: Unit Test
runs-on: ubuntu-latest
- timeout-minutes: 30
+ timeout-minutes: 60
needs: [ unit-test, paths-filter ]
if: always()
steps:
diff --git a/docs/docs/en/guide/project/workflow-instance.md b/docs/docs/en/guide/project/workflow-instance.md
index b608c8df8d..ab5ec8843f 100644
--- a/docs/docs/en/guide/project/workflow-instance.md
+++ b/docs/docs/en/guide/project/workflow-instance.md
@@ -2,47 +2,73 @@
## View Workflow Instance
-Click `Project Management -> Workflow -> Workflow Instance`, enter the Workflow Instance page, as shown in the following figure:
+Click `Project Management -> Workflow -> Workflow Instance`, enter the Workflow Instance page, as shown in the following
+figure:
-Click the workflow name to enter the DAG view page, and check the task execution status, as shown in the following figure:
+Click the workflow name to enter the DAG view page, and check the task execution status, as shown in the following
+figure:
## View Task Log
-Enter the workflow instance page, click the workflow name, enter the DAG view page, double-click the task node, as shown in the following figure:
+Enter the workflow instance page, click the workflow name, enter the DAG view page, double-click the task node, as shown
+in the following figure:
-Click "View Log", a log window pops up, as shown in the figure below, you can also view the task log on the task instance page, refer to [Task View Log](./task-instance.md)
+Click "View Log", a log window pops up, as shown in the figure below, you can also view the task log on the task
+instance page, refer to [Task View Log](./task-instance.md)
## View Task History
-Click `Project Management -> Workflow -> Workflow Instance` to enter the workflow instance page, click the workflow name to enter the workflow DAG page;
+Click `Project Management -> Workflow -> Workflow Instance` to enter the workflow instance page, click the workflow name
+to enter the workflow DAG page;
-Double-click the task node, click `View History` to jump to the task instance page, and display the list of task instances run by the task definition.
+Double-click the task node, click `View History` to jump to the task instance page, and display the list of task
+instances run by the task definition.
## View Running Parameters
-Click `Project Management -> Workflow -> Workflow Instance` to enter the workflow instance page, click the workflow name to enter the workflow DAG page;
+Click `Project Management -> Workflow -> Workflow Instance` to enter the workflow instance page, click the workflow name
+to enter the workflow DAG page;
-Click the icon in the upper left corner <img src="../../../../img/run_params_button.png" width="35"/> to view the startup parameters of the workflow instance; click the icon <img src="../../../../img/global_param.png" width="35"/> to view the global parameters and local parameters of the workflow instance, as shown in the following figure:
+Click the icon in the upper left corner <img src="../../../../img/run_params_button.png" width="35"/> to view the
+startup parameters of the workflow instance; click the icon <img src="../../../../img/global_param.png" width="35"/> to
+view the global parameters and local parameters of the workflow instance, as shown in the following figure:
## Workflow Instance Operation Function
-Click `Project Management -> Workflow -> Workflow Instance`, enter the workflow instance page, as shown in the following figure:
+Click `Project Management -> Workflow -> Workflow Instance`, enter the workflow instance page, as shown in the following
+figure:
-- **Edit:** Only processes with success/failed/stop status can be edited. Click the "Edit" button or the workflow instance name to enter the DAG edit page. After the edit, click the "Save" button to confirm, as shown in the figure below. In the pop-up box, check "Whether to update the workflow definition", after saving, the information modified by the instance will be updated to the workflow definition; if not checked, the workflow definition would not be updated.
+| WorkflowInstanceState \ Operation | Edit | Rerun | Stop | Pause | Resume Suspend | Delete | Gantt Chart |
+|-----------------------------------|------|-------|------|-------|----------------|--------|-------------|
+| SUBMITTED_SUCCESS | | | √ | √ | | | √ |
+| SERIAL_WAIT | | | √ | | | | √ |
+| WAIT_TO_RUN | | | √ | | | | √ |
+| Executing | | | √ | √ | | | √ |
+| READY PAUSE | | | | | | | √ |
+| PAUSE | √ | √ | | | √ | √ | √ |
+| READY STOP | | | | | | | √ |
+| STOP | √ | √ | | | √ | √ | √ |
+| FAILURE | √ | √ | | | | √ | √ |
+| SUCCESS | √ | √ | | | | √ | √ |
+
+- **Edit:** Only processes with success/failed/stop status can be edited. Click the "Edit" button or the workflow
+ instance name to enter the DAG edit page. After the edit, click the "Save" button to confirm, as shown in the figure
+ below. In the pop-up box, check "Whether to update the workflow definition", after saving, the information modified by
+ the instance will be updated to the workflow definition; if not checked, the workflow definition would not be updated.
<p align="center">
<img src="../../../../img/editDag-en.png" width="80%" />
@@ -52,15 +78,18 @@ Click `Project Management -> Workflow -> Workflow Instance`, enter the workflow
- **Recovery Failed:** For failed processes, you can perform failure recovery operations, starting from the failed node
-- **Stop:** **Stop** the running process, the background code will first `kill` the worker process, and then execute `kill -9` operation
+- **Stop:** **Stop** the running process, the background code will first `kill` the worker process, and then
+ execute `kill -9` operation
-- **Pause:** **Pause** the running process, the system status will change to **waiting for execution**, it will wait for the task to finish, and pause the next sequence task.
+- **Pause:** **Pause** the running process, the system status will change to **waiting for execution**, it will wait for
+ the task to finish, and pause the next sequence task.
- **Resume pause:** Resume the paused process, start running directly from the **paused node**
- **Delete:** Delete the workflow instance and the task instance under the workflow instance
-- **Gantt Chart:** The vertical axis of the Gantt chart is the topological sorting of task instances of the workflow instance, and the horizontal axis is the running time of the task instances, as shown in the figure:
+- **Gantt Chart:** The vertical axis of the Gantt chart is the topological sorting of task instances of the workflow
+ instance, and the horizontal axis is the running time of the task instances, as shown in the figure:
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
index 2a701ab143..5192561cf1 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/plugin/AlertPluginManager.java
@@ -84,12 +84,8 @@ public final class AlertPluginManager {
String name = entry.getKey();
AlertChannelFactory factory = entry.getValue();
- log.info("Registering alert plugin: {} - {}", name, factory.getClass().getSimpleName());
-
final AlertChannel alertChannel = factory.create();
- log.info("Registered alert plugin: {} - {}", name, factory.getClass().getSimpleName());
-
final List<PluginParams> params = new ArrayList<>(factory.params());
final String paramsJson = PluginParamsTransfer.transferParamsToJson(params);
@@ -99,6 +95,8 @@ public final class AlertPluginManager {
final int id = pluginDao.addOrUpdatePluginDefine(pluginDefine);
alertPluginMap.put(id, alertChannel);
+
+ log.info("Success register alert plugin: {}", name);
}
}
diff --git a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java
index 6a563efb48..9d4ee34b5b 100644
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ExecutorAPITest.java
@@ -145,12 +145,4 @@ public class ExecutorAPITest {
}
}
- @Test
- @Order(2)
- public void testStartCheckProcessDefinition() {
- HttpResponse testStartCheckProcessDefinitionResponse =
- executorPage.startCheckProcessDefinition(loginUser, projectCode, processDefinitionCode);
- Assertions.assertTrue(testStartCheckProcessDefinitionResponse.getBody().getSuccess());
- }
-
}
diff --git a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java
index 1ddc2f8275..35708f4955 100644
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/cases/ProcessInstanceAPITest.java
@@ -19,7 +19,6 @@
package org.apache.dolphinscheduler.api.test.cases;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.dolphinscheduler.api.test.core.DolphinScheduler;
@@ -37,7 +36,6 @@ import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.util.EntityUtils;
@@ -53,6 +51,7 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.awaitility.Awaitility;
@@ -81,8 +80,6 @@ public class ProcessInstanceAPITest {
private static long processDefinitionCode;
- private static long triggerCode;
-
private static int processInstanceId;
@BeforeAll
@@ -154,16 +151,11 @@ public class ProcessInstanceAPITest {
.atMost(30, TimeUnit.SECONDS)
.untilAsserted(() -> {
// query workflow instance by trigger code
- triggerCode = (long) startProcessInstanceResponse.getBody().getData();
- HttpResponse queryProcessInstancesByTriggerCodeResponse = processInstancePage
- .queryProcessInstancesByTriggerCode(loginUser, projectCode, triggerCode);
- assertTrue(queryProcessInstancesByTriggerCodeResponse.getBody().getSuccess());
- List<LinkedHashMap<String, Object>> body =
- (List<LinkedHashMap<String, Object>>) queryProcessInstancesByTriggerCodeResponse
- .getBody().getData();
- assertTrue(CollectionUtils.isNotEmpty(body));
- assertEquals("SUCCESS", body.get(0).get("state"));
- processInstanceId = (int) body.get(0).get("id");
+ HttpResponse queryProcessInstanceListResponse =
+ processInstancePage.queryProcessInstanceList(loginUser, projectCode, 1, 10);
+ assertTrue(queryProcessInstanceListResponse.getBody().getSuccess());
+ assertTrue(queryProcessInstanceListResponse.getBody().getData().toString()
+ .contains("test_import"));
});
} catch (Exception e) {
log.error("failed", e);
@@ -182,6 +174,7 @@ public class ProcessInstanceAPITest {
@Test
@Order(3)
+ @Disabled
public void testQueryTaskListByProcessId() {
HttpResponse queryTaskListByProcessIdResponse =
processInstancePage.queryTaskListByProcessId(loginUser, projectCode, processInstanceId);
@@ -191,6 +184,7 @@ public class ProcessInstanceAPITest {
@Test
@Order(4)
+ @Disabled
public void testQueryProcessInstanceById() {
HttpResponse queryProcessInstanceByIdResponse =
processInstancePage.queryProcessInstanceById(loginUser, projectCode, processInstanceId);
@@ -200,6 +194,7 @@ public class ProcessInstanceAPITest {
@Test
@Order(5)
+ @Disabled
public void testDeleteProcessInstanceById() {
HttpResponse deleteProcessInstanceByIdResponse =
processInstancePage.deleteProcessInstanceById(loginUser, projectCode, processInstanceId);
diff --git a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/workflow/ExecutorPage.java b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/workflow/ExecutorPage.java
index 1318aa6f3e..320457ab85 100644
--- a/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/workflow/ExecutorPage.java
+++ b/dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api/test/pages/workflow/ExecutorPage.java
@@ -40,8 +40,11 @@ public class ExecutorPage {
private String sessionId;
- public HttpResponse startProcessInstance(User loginUser, long projectCode, long processDefinitionCode,
- String scheduleTime, FailureStrategy failureStrategy,
+ public HttpResponse startProcessInstance(User loginUser,
+ long projectCode,
+ long processDefinitionCode,
+ String scheduleTime,
+ FailureStrategy failureStrategy,
WarningType warningType) {
Map<String, Object> params = new HashMap<>();
params.put("loginUser", loginUser);
@@ -82,18 +85,6 @@ public class ExecutorPage {
return requestClient.post(url, headers, params);
}
- public HttpResponse startCheckProcessDefinition(User loginUser, long projectCode, long processDefinitionCode) {
- Map<String, Object> params = new HashMap<>();
- params.put("loginUser", loginUser);
- params.put("processDefinitionCode", processDefinitionCode);
- Map<String, String> headers = new HashMap<>();
- headers.put(Constants.SESSION_ID_KEY, sessionId);
-
- RequestClient requestClient = new RequestClient();
- String url = String.format("/projects/%s/executors/start-check", projectCode);
- return requestClient.post(url, headers, params);
- }
-
public HttpResponse executeTask(User loginUser, long projectCode, int processInstanceId, String startNodeList,
TaskDependType taskDependType) {
Map<String, Object> params = new HashMap<>();
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
index 8c86de7fe6..5169894c68 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
@@ -19,40 +19,35 @@ package org.apache.dolphinscheduler.api.controller;
import static org.apache.dolphinscheduler.api.enums.Status.BATCH_EXECUTE_PROCESS_INSTANCE_ERROR;
import static org.apache.dolphinscheduler.api.enums.Status.BATCH_START_PROCESS_INSTANCE_ERROR;
-import static org.apache.dolphinscheduler.api.enums.Status.CHECK_PROCESS_DEFINITION_ERROR;
import static org.apache.dolphinscheduler.api.enums.Status.EXECUTE_PROCESS_INSTANCE_ERROR;
-import static org.apache.dolphinscheduler.api.enums.Status.QUERY_EXECUTING_WORKFLOW_ERROR;
import static org.apache.dolphinscheduler.api.enums.Status.START_PROCESS_INSTANCE_ERROR;
import static org.apache.dolphinscheduler.api.enums.Status.START_TASK_INSTANCE_ERROR;
import org.apache.dolphinscheduler.api.audit.OperatorLog;
import org.apache.dolphinscheduler.api.audit.enums.AuditType;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowBackFillRequest;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowTriggerRequest;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ApiException;
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.ExecutorService;
import org.apache.dolphinscheduler.api.utils.Result;
+import org.apache.dolphinscheduler.api.utils.WorkflowUtils;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
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.RunMode;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.extract.master.dto.WorkflowExecuteDto;
-import org.apache.dolphinscheduler.plugin.task.api.model.Property;
-import org.apache.dolphinscheduler.plugin.task.api.utils.PropertyUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -61,7 +56,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
-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.RequestAttribute;
@@ -91,23 +85,21 @@ public class ExecutorController extends BaseController {
/**
* execute process instance
*
- * @param loginUser login user
- * @param projectCode project code
- * @param processDefinitionCode process definition code
- * @param scheduleTime schedule time when CommandType is COMPLEMENT_DATA there are two ways to transfer parameters 1.date range, for example:{"complementStartDate":"2022-01-01 12:12:12","complementEndDate":"2022-01-6 12:12:12"} 2.manual input, for example:{"complementScheduleDateList":"2022-01-01 00:00:00,2022-01-02 12:12:12,2022-01-03 12:12:12"}
- * @param failureStrategy failure strategy
- * @param startNodeList start nodes list
- * @param taskDependType task depend type
- * @param execType execute type
- * @param warningType warning type
- * @param warningGroupId warning group id
- * @param runMode run mode
- * @param processInstancePriority process instance priority
- * @param workerGroup worker group
- * @param timeout timeout
+ * @param loginUser login user
+ * @param processDefinitionCode process definition code
+ * @param scheduleTime schedule time when CommandType is COMPLEMENT_DATA there are two ways to transfer parameters 1.date range, for example:{"complementStartDate":"2022-01-01 12:12:12","complementEndDate":"2022-01-6 12:12:12"} 2.manual input, for example:{"complementScheduleDateList":"2022-01-01 00:00:00,2022-01-02 12:12:12,2022-01-03 12:12:12"}
+ * @param failureStrategy failure strategy
+ * @param startNodeList start nodes list
+ * @param taskDependType task depend type
+ * @param execType execute type
+ * @param warningType warning type
+ * @param warningGroupId warning group id
+ * @param runMode run mode
+ * @param processInstancePriority process instance priority
+ * @param workerGroup worker group
* @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
- * @param testFlag testFlag
- * @param executionOrder complement data in some kind of order
+ * @param testFlag testFlag
+ * @param executionOrder complement data in some kind of order
* @return start process result code
*/
@Operation(summary = "startProcessInstance", description = "RUN_PROCESS_INSTANCE_NOTES")
@@ -137,48 +129,76 @@ public class ExecutorController extends BaseController {
@ResponseStatus(HttpStatus.OK)
@ApiException(START_PROCESS_INSTANCE_ERROR)
@OperatorLog(auditType = AuditType.PROCESS_START)
- public Result startProcessInstance(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @Parameter(name = "projectCode", description = "PROJECT_CODE", required = true) @PathVariable long projectCode,
- @RequestParam(value = "processDefinitionCode") long processDefinitionCode,
- @RequestParam(value = "scheduleTime") String scheduleTime,
- @RequestParam(value = "failureStrategy") FailureStrategy failureStrategy,
- @RequestParam(value = "startNodeList", required = false) String startNodeList,
- @RequestParam(value = "taskDependType", required = false) TaskDependType taskDependType,
- @RequestParam(value = "execType", required = false) CommandType execType,
- @RequestParam(value = "warningType") WarningType warningType,
- @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
- @RequestParam(value = "runMode", required = false) RunMode runMode,
- @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,
- @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
- @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
- @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
- @RequestParam(value = "timeout", required = false) Integer timeout,
- @RequestParam(value = "startParams", required = false) String startParams,
- @RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
- @RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
- @RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
- @RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
- @RequestParam(value = "version", required = false) Integer version,
- @RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
- @RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
-
- if (timeout == null) {
- timeout = Constants.MAX_TASK_TIMEOUT;
- }
-
- List<Property> startParamList = PropertyUtils.startParamsTransformPropertyList(startParams);
-
- if (complementDependentMode == null) {
- complementDependentMode = ComplementDependentMode.OFF_MODE;
+ public Result<Long> triggerWorkflowDefinition(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @RequestParam(value = "processDefinitionCode") long processDefinitionCode,
+ @RequestParam(value = "scheduleTime") String scheduleTime,
+ @RequestParam(value = "failureStrategy") FailureStrategy failureStrategy,
+ @RequestParam(value = "startNodeList", required = false) String startNodeList,
+ @RequestParam(value = "taskDependType", required = false, defaultValue = "TASK_POST") TaskDependType taskDependType,
+ @RequestParam(value = "execType", required = false, defaultValue = "START_PROCESS") CommandType execType,
+ @RequestParam(value = "warningType") WarningType warningType,
+ @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
+ @RequestParam(value = "runMode", required = false) RunMode runMode,
+ @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,
+ @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
+ @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
+ @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
+ @RequestParam(value = "startParams", required = false) String startParams,
+ @RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
+ @RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
+ @RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
+ @RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
+ @RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
+ @RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
+
+ switch (execType) {
+ case START_PROCESS:
+ final WorkflowTriggerRequest workflowTriggerRequest = WorkflowTriggerRequest.builder()
+ .loginUser(loginUser)
+ .workflowDefinitionCode(processDefinitionCode)
+ .startNodes(startNodeList)
+ .failureStrategy(failureStrategy)
+ .taskDependType(taskDependType)
+ .execType(execType)
+ .warningType(warningType)
+ .warningGroupId(warningGroupId)
+ .workflowInstancePriority(processInstancePriority)
+ .workerGroup(workerGroup)
+ .tenantCode(tenantCode)
+ .environmentCode(environmentCode)
+ .startParamList(startParams)
+ .dryRun(Flag.of(dryRun))
+ .testFlag(Flag.of(testFlag))
+ .build();
+ return Result.success(execService.triggerWorkflowDefinition(workflowTriggerRequest));
+ case COMPLEMENT_DATA:
+ final WorkflowBackFillRequest workflowBackFillRequest = WorkflowBackFillRequest.builder()
+ .loginUser(loginUser)
+ .workflowDefinitionCode(processDefinitionCode)
+ .startNodes(startNodeList)
+ .failureStrategy(failureStrategy)
+ .taskDependType(taskDependType)
+ .execType(execType)
+ .warningType(warningType)
+ .warningGroupId(warningGroupId)
+ .backfillRunMode(runMode)
+ .workflowInstancePriority(processInstancePriority)
+ .workerGroup(workerGroup)
+ .tenantCode(tenantCode)
+ .environmentCode(environmentCode)
+ .startParamList(startParams)
+ .dryRun(Flag.of(dryRun))
+ .testFlag(Flag.of(testFlag))
+ .backfillTime(WorkflowUtils.parseBackfillTime(scheduleTime))
+ .expectedParallelismNumber(expectedParallelismNumber)
+ .backfillDependentMode(complementDependentMode)
+ .allLevelDependent(allLevelDependent)
+ .executionOrder(executionOrder)
+ .build();
+ return Result.success(execService.backfillWorkflowDefinition(workflowBackFillRequest));
+ default:
+ throw new ServiceException("The execType: " + execType + " is invalid");
}
-
- Map<String, Object> result = execService.execProcessInstance(loginUser, projectCode, processDefinitionCode,
- scheduleTime, execType, failureStrategy,
- startNodeList, taskDependType, warningType, warningGroupId, runMode, processInstancePriority,
- workerGroup, tenantCode, environmentCode, timeout, startParamList, expectedParallelismNumber, dryRun,
- testFlag,
- complementDependentMode, version, allLevelDependent, executionOrder);
- return returnDataList(result);
}
/**
@@ -186,24 +206,22 @@ public class ExecutorController extends BaseController {
* If any processDefinitionCode cannot be found, the failure information is returned and the status is set to
* failed. The successful task will run normally and will not stop
*
- * @param loginUser login user
- * @param projectCode project code
- * @param processDefinitionCodes process definition codes
- * @param scheduleTime schedule time
- * @param failureStrategy failure strategy
- * @param startNodeList start nodes list
- * @param taskDependType task depend type
- * @param execType execute type
- * @param warningType warning type
- * @param warningGroupId warning group id
- * @param runMode run mode
- * @param processInstancePriority process instance priority
- * @param workerGroup worker group
- * @param tenantCode tenant code
- * @param timeout timeout
+ * @param loginUser login user
+ * @param processDefinitionCodes process definition codes
+ * @param scheduleTime schedule time
+ * @param failureStrategy failure strategy
+ * @param startNodeList start nodes list
+ * @param taskDependType task depend type
+ * @param execType execute type
+ * @param warningType warning type
+ * @param warningGroupId warning group id
+ * @param runMode run mode
+ * @param processInstancePriority process instance priority
+ * @param workerGroup worker group
+ * @param tenantCode tenant code
* @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
- * @param testFlag testFlag
- * @param executionOrder complement data in some kind of order
+ * @param testFlag testFlag
+ * @param executionOrder complement data in some kind of order
* @return start process result code
*/
@Operation(summary = "batchStartProcessInstance", description = "BATCH_RUN_PROCESS_INSTANCE_NOTES")
@@ -221,7 +239,6 @@ public class ExecutorController extends BaseController {
@Parameter(name = "workerGroup", description = "WORKER_GROUP", schema = @Schema(implementation = String.class, example = "default")),
@Parameter(name = "tenantCode", description = "TENANT_CODE", schema = @Schema(implementation = String.class, example = "default")),
@Parameter(name = "environmentCode", description = "ENVIRONMENT_CODE", schema = @Schema(implementation = Long.class, example = "-1")),
- @Parameter(name = "timeout", description = "TIMEOUT", schema = @Schema(implementation = int.class, example = "100")),
@Parameter(name = "expectedParallelismNumber", description = "EXPECTED_PARALLELISM_NUMBER", schema = @Schema(implementation = int.class, example = "8")),
@Parameter(name = "dryRun", description = "DRY_RUN", schema = @Schema(implementation = int.class, example = "0")),
@Parameter(name = "testFlag", description = "TEST_FLAG", schema = @Schema(implementation = int.class, example = "0")),
@@ -233,84 +250,62 @@ public class ExecutorController extends BaseController {
@ResponseStatus(HttpStatus.OK)
@ApiException(BATCH_START_PROCESS_INSTANCE_ERROR)
@OperatorLog(auditType = AuditType.PROCESS_BATCH_START)
- public Result batchStartProcessInstance(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @Parameter(name = "projectCode", description = "PROJECT_CODE", required = true) @PathVariable long projectCode,
- @RequestParam(value = "processDefinitionCodes") String processDefinitionCodes,
- @RequestParam(value = "scheduleTime") String scheduleTime,
- @RequestParam(value = "failureStrategy") FailureStrategy failureStrategy,
- @RequestParam(value = "startNodeList", required = false) String startNodeList,
- @RequestParam(value = "taskDependType", required = false) TaskDependType taskDependType,
- @RequestParam(value = "execType", required = false) CommandType execType,
- @RequestParam(value = "warningType") WarningType warningType,
- @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
- @RequestParam(value = "runMode", required = false) RunMode runMode,
- @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,
- @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
- @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
- @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
- @RequestParam(value = "timeout", required = false) Integer timeout,
- @RequestParam(value = "startParams", required = false) String startParams,
- @RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
- @RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
- @RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
- @RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
- @RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
- @RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
-
- if (timeout == null) {
- log.debug("Parameter timeout set to {} due to null.", Constants.MAX_TASK_TIMEOUT);
- timeout = Constants.MAX_TASK_TIMEOUT;
- }
-
- List<Property> startParamList = PropertyUtils.startParamsTransformPropertyList(startParams);
-
- if (complementDependentMode == null) {
- log.debug("Parameter complementDependentMode set to {} due to null.", ComplementDependentMode.OFF_MODE);
- complementDependentMode = ComplementDependentMode.OFF_MODE;
- }
-
- Map<String, Object> result = new HashMap<>();
- List<String> processDefinitionCodeArray = Arrays.asList(processDefinitionCodes.split(Constants.COMMA));
- List<String> startFailedProcessDefinitionCodeList = new ArrayList<>();
-
- processDefinitionCodeArray = processDefinitionCodeArray.stream().distinct().collect(Collectors.toList());
-
- for (String strProcessDefinitionCode : processDefinitionCodeArray) {
- long processDefinitionCode = Long.parseLong(strProcessDefinitionCode);
- result = execService.execProcessInstance(loginUser, projectCode, processDefinitionCode, scheduleTime,
- execType, failureStrategy,
- startNodeList, taskDependType, warningType, warningGroupId, runMode, processInstancePriority,
- workerGroup, tenantCode, environmentCode, timeout, startParamList, expectedParallelismNumber,
+ public Result<List<Long>> batchTriggerWorkflowDefinitions(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @RequestParam(value = "processDefinitionCodes") String processDefinitionCodes,
+ @RequestParam(value = "scheduleTime") String scheduleTime,
+ @RequestParam(value = "failureStrategy") FailureStrategy failureStrategy,
+ @RequestParam(value = "startNodeList", required = false) String startNodeList,
+ @RequestParam(value = "taskDependType", required = false) TaskDependType taskDependType,
+ @RequestParam(value = "execType", required = false) CommandType execType,
+ @RequestParam(value = "warningType") WarningType warningType,
+ @RequestParam(value = "warningGroupId", required = false) Integer warningGroupId,
+ @RequestParam(value = "runMode", required = false) RunMode runMode,
+ @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,
+ @RequestParam(value = "workerGroup", required = false, defaultValue = "default") String workerGroup,
+ @RequestParam(value = "tenantCode", required = false, defaultValue = "default") String tenantCode,
+ @RequestParam(value = "environmentCode", required = false, defaultValue = "-1") Long environmentCode,
+ @RequestParam(value = "startParams", required = false) String startParams,
+ @RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
+ @RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
+ @RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
+ @RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
+ @RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
+ @RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
+
+ List<Long> workflowDefinitionCodes = Arrays.stream(processDefinitionCodes.split(Constants.COMMA))
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+
+ List<Long> result = new ArrayList<>();
+ for (Long workflowDefinitionCode : workflowDefinitionCodes) {
+ Result<Long> triggerCodeResult = triggerWorkflowDefinition(loginUser,
+ workflowDefinitionCode,
+ scheduleTime,
+ failureStrategy,
+ startNodeList,
+ taskDependType,
+ execType,
+ warningType,
+ warningGroupId,
+ runMode,
+ processInstancePriority,
+ workerGroup,
+ tenantCode,
+ environmentCode,
+ startParams,
+ expectedParallelismNumber,
dryRun,
testFlag,
- complementDependentMode, null, allLevelDependent, executionOrder);
-
- if (!Status.SUCCESS.equals(result.get(Constants.STATUS))) {
- log.error("Process definition start failed, projectCode:{}, processDefinitionCode:{}.", projectCode,
- processDefinitionCode);
- startFailedProcessDefinitionCodeList.add(String.valueOf(processDefinitionCode));
- } else {
- log.info("Start process definition complete, projectCode:{}, processDefinitionCode:{}.", projectCode,
- processDefinitionCode);
- }
- }
-
- if (!startFailedProcessDefinitionCodeList.isEmpty()) {
- putMsg(result, BATCH_START_PROCESS_INSTANCE_ERROR,
- String.join(Constants.COMMA, startFailedProcessDefinitionCodeList));
+ complementDependentMode,
+ allLevelDependent,
+ executionOrder);
+ result.add(triggerCodeResult.getData());
}
-
- return returnDataList(result);
+ return Result.success(result);
}
/**
* do action to process instance: pause, stop, repeat, recover from pause, recover from stop
- *
- * @param loginUser login user
- * @param projectCode project code
- * @param processInstanceId process instance id
- * @param executeType execute type
- * @return execute result code
*/
@Operation(summary = "execute", description = "EXECUTE_ACTION_TO_PROCESS_INSTANCE_NOTES")
@Parameters({
@@ -321,21 +316,19 @@ public class ExecutorController extends BaseController {
@ResponseStatus(HttpStatus.OK)
@ApiException(EXECUTE_PROCESS_INSTANCE_ERROR)
@OperatorLog(auditType = AuditType.PROCESS_EXECUTE)
- public Result execute(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @Parameter(name = "projectCode", description = "PROJECT_CODE", required = true) @PathVariable long projectCode,
- @RequestParam("processInstanceId") Integer processInstanceId,
- @RequestParam("executeType") ExecuteType executeType) {
- Map<String, Object> result = execService.execute(loginUser, projectCode, processInstanceId, executeType);
- return returnDataList(result);
+ public Result<Void> controlWorkflowInstance(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @RequestParam("processInstanceId") Integer processInstanceId,
+ @RequestParam("executeType") ExecuteType executeType) {
+ execService.controlWorkflowInstance(loginUser, processInstanceId, executeType);
+ return Result.success();
}
/**
* batch execute and do action to process instance
*
- * @param loginUser login user
- * @param projectCode project code
+ * @param loginUser login user
* @param processInstanceIds process instance ids, delimiter by "," if more than one id
- * @param executeType execute type
+ * @param executeType execute type
* @return execute result code
*/
@Operation(summary = "batchExecute", description = "BATCH_EXECUTE_ACTION_TO_PROCESS_INSTANCE_NOTES")
@@ -348,84 +341,38 @@ public class ExecutorController extends BaseController {
@ResponseStatus(HttpStatus.OK)
@ApiException(BATCH_EXECUTE_PROCESS_INSTANCE_ERROR)
@OperatorLog(auditType = AuditType.PROCESS_BATCH_RERUN)
- public Result batchExecute(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @PathVariable long projectCode,
- @RequestParam("processInstanceIds") String processInstanceIds,
- @RequestParam("executeType") ExecuteType executeType) {
- Map<String, Object> result = new HashMap<>();
- List<String> executeFailedIdList = new ArrayList<>();
- if (!StringUtils.isEmpty(processInstanceIds)) {
- String[] processInstanceIdArray = processInstanceIds.split(Constants.COMMA);
-
- for (String strProcessInstanceId : processInstanceIdArray) {
- int processInstanceId = Integer.parseInt(strProcessInstanceId);
- try {
- Map<String, Object> singleResult =
- execService.execute(loginUser, projectCode, processInstanceId, executeType);
- if (!Status.SUCCESS.equals(singleResult.get(Constants.STATUS))) {
- log.error("Start to execute process instance error, projectCode:{}, processInstanceId:{}.",
- projectCode, processInstanceId);
- executeFailedIdList.add((String) singleResult.get(Constants.MSG));
- } else
- log.info("Start to execute process instance complete, projectCode:{}, processInstanceId:{}.",
- projectCode, processInstanceId);
- } catch (Exception e) {
- executeFailedIdList
- .add(MessageFormat.format(Status.PROCESS_INSTANCE_ERROR.getMsg(), strProcessInstanceId));
- }
+ public Result<Void> batchControlWorkflowInstance(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @RequestParam("processInstanceIds") String processInstanceIds,
+ @RequestParam("executeType") ExecuteType executeType) {
+
+ String[] processInstanceIdArray = processInstanceIds.split(Constants.COMMA);
+ List<String> errorMessage = new ArrayList<>();
+ for (String strProcessInstanceId : processInstanceIdArray) {
+ int processInstanceId = Integer.parseInt(strProcessInstanceId);
+ try {
+ execService.controlWorkflowInstance(loginUser, processInstanceId, executeType);
+ log.info("Success do action {} on workflowInstance: {}", executeType, processInstanceId);
+ } catch (Exception e) {
+ errorMessage.add("Failed do action " + executeType + " on workflowInstance: " + processInstanceId
+ + "reason: " + e.getMessage());
+ log.error("Failed do action {} on workflowInstance: {}, error: {}", executeType, processInstanceId, e);
}
}
- if (!executeFailedIdList.isEmpty()) {
- putMsg(result, Status.BATCH_EXECUTE_PROCESS_INSTANCE_ERROR, String.join("\n", executeFailedIdList));
- } else {
- putMsg(result, Status.SUCCESS);
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(errorMessage)) {
+ throw new ServiceException(String.join("\n", errorMessage));
}
- return returnDataList(result);
- }
-
- /**
- * check process definition and all the son process definitions is online.
- *
- * @param processDefinitionCode process definition code
- * @return check result code
- */
- @Operation(summary = "startCheckProcessDefinition", description = "START_CHECK_PROCESS_DEFINITION_NOTES")
- @Parameters({
- @Parameter(name = "processDefinitionCode", description = "PROCESS_DEFINITION_CODE", required = true, schema = @Schema(implementation = long.class, example = "100"))
- })
- @PostMapping(value = "/start-check")
- @ResponseStatus(HttpStatus.OK)
- @ApiException(CHECK_PROCESS_DEFINITION_ERROR)
- public Result startCheckProcessDefinition(@RequestParam(value = "processDefinitionCode") long processDefinitionCode) {
- Map<String, Object> result = execService.startCheckByProcessDefinedCode(processDefinitionCode);
- return returnDataList(result);
- }
-
- /**
- * query execute data of processInstance from master
- */
- @Operation(summary = "queryExecutingWorkflow", description = "QUERY_WORKFLOW_EXECUTE_DATA")
- @Parameters({
- @Parameter(name = "processInstanceId", description = "PROCESS_INSTANCE_ID", required = true, schema = @Schema(implementation = int.class, example = "100"))
- })
- @GetMapping(value = "/query-executing-workflow")
- @ResponseStatus(HttpStatus.OK)
- @ApiException(QUERY_EXECUTING_WORKFLOW_ERROR)
- public Result queryExecutingWorkflow(@RequestParam("id") Integer processInstanceId) {
- WorkflowExecuteDto workflowExecuteDto =
- execService.queryExecutingWorkflowByProcessInstanceId(processInstanceId);
- return Result.success(workflowExecuteDto);
+ return Result.success();
}
/**
* execute task instance
*
- * @param loginUser login user
- * @param projectCode project code
- * @param code taskDefinitionCode
- * @param version taskDefinitionVersion
+ * @param loginUser login user
+ * @param projectCode project code
+ * @param code taskDefinitionCode
+ * @param version taskDefinitionVersion
* @param warningGroupId warning group id
- * @param workerGroup worker group
+ * @param workerGroup worker group
* @return start task result code
*/
@Operation(summary = "startTaskInstance", description = "RUN_TASK_INSTANCE_NOTES")
@@ -471,11 +418,11 @@ public class ExecutorController extends BaseController {
/**
* do action to process instance: pause, stop, repeat, recover from pause, recover from stop
*
- * @param loginUser login user
- * @param projectCode project code
+ * @param loginUser login user
+ * @param projectCode project code
* @param processInstanceId process instance id
- * @param startNodeList start node list
- * @param taskDependType task depend type
+ * @param startNodeList start node list
+ * @param taskDependType task depend type
* @return execute result code
*/
@Operation(summary = "execute-task", description = "EXECUTE_ACTION_TO_PROCESS_INSTANCE_NOTES")
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 546a3644ad..eba4496dd3 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
@@ -420,6 +420,10 @@ public class ProcessInstanceController extends BaseController {
return returnDataList(result);
}
+ // Todo: This is unstable, in some case the command trigger failed, we cannot get workflow instance
+ // And it's a bad design to use trigger code to get workflow instance why not directly get by workflow instanceId or
+ // inject the trigger id into workflow instance?
+ @Deprecated
@Operation(summary = "queryProcessInstanceListByTrigger", description = "QUERY_PROCESS_INSTANCE_BY_TRIGGER_NOTES")
@Parameters({
@Parameter(name = "projectCode", description = "PROJECT_CODE", required = true, schema = @Schema(implementation = Long.class)),
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2Controller.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2Controller.java
index c44e0c4f8a..747d4a73c6 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2Controller.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2Controller.java
@@ -134,10 +134,10 @@ public class WorkflowInstanceV2Controller extends BaseController {
@PostMapping(value = "/{workflowInstanceId}/execute/{executeType}")
@ResponseStatus(HttpStatus.OK)
@ApiException(Status.EXECUTE_PROCESS_INSTANCE_ERROR)
- public Result execute(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @PathVariable("workflowInstanceId") Integer workflowInstanceId,
- @PathVariable("executeType") ExecuteType executeType) {
- Map<String, Object> result = execService.execute(loginUser, workflowInstanceId, executeType);
- return returnDataList(result);
+ public Result<Void> execute(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @PathVariable("workflowInstanceId") Integer workflowInstanceId,
+ @PathVariable("executeType") ExecuteType executeType) {
+ execService.controlWorkflowInstance(loginUser, workflowInstanceId, executeType);
+ return Result.success();
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowBackFillRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowBackFillRequest.java
new file mode 100644
index 0000000000..3e275c378b
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowBackFillRequest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.api.dto.workflow;
+
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
+import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
+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.RunMode;
+import org.apache.dolphinscheduler.common.enums.TaskDependType;
+import org.apache.dolphinscheduler.common.enums.WarningType;
+import org.apache.dolphinscheduler.dao.entity.User;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class WorkflowBackFillRequest {
+
+ private User loginUser;
+
+ private long workflowDefinitionCode;
+
+ private String startNodes;
+
+ private FailureStrategy failureStrategy;
+
+ private TaskDependType taskDependType;
+
+ private CommandType execType;
+
+ private WarningType warningType;
+
+ private Integer warningGroupId;
+
+ private Priority workflowInstancePriority;
+
+ private String workerGroup;
+
+ private String tenantCode;
+
+ private Long environmentCode;
+
+ private String startParamList;
+
+ private Flag dryRun;
+
+ private Flag testFlag;
+
+ private RunMode backfillRunMode;
+
+ private BackfillTime backfillTime;
+
+ private Integer expectedParallelismNumber;
+
+ private ComplementDependentMode backfillDependentMode;
+
+ private boolean allLevelDependent;
+
+ private ExecutionOrder executionOrder;
+
+ @Data
+ @Builder
+ @AllArgsConstructor
+ @NoArgsConstructor
+ public static class BackfillTime {
+
+ private String complementStartDate;
+ private String complementEndDate;
+ private String complementScheduleDateList;
+
+ }
+
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowTriggerRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowTriggerRequest.java
new file mode 100644
index 0000000000..a7a5aad627
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowTriggerRequest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.api.dto.workflow;
+
+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.dao.entity.User;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@AllArgsConstructor
+public class WorkflowTriggerRequest {
+
+ private User loginUser;
+
+ private long workflowDefinitionCode;
+
+ private String startNodes;
+
+ private FailureStrategy failureStrategy;
+
+ private TaskDependType taskDependType;
+
+ private CommandType execType;
+
+ private WarningType warningType;
+
+ private Integer warningGroupId;
+
+ private Priority workflowInstancePriority;
+
+ private String workerGroup;
+
+ private String tenantCode;
+
+ private Long environmentCode;
+
+ private String startParamList;
+
+ private Flag dryRun;
+
+ private Flag testFlag;
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
index 9ab2d29f6a..a39757c649 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
@@ -49,7 +49,7 @@ public class ApiExceptionHandler {
return Result.errorWithArgs(Status.INTERNAL_SERVER_ERROR_ARGS, e.getMessage());
}
Status st = ce.value();
- return Result.error(st);
+ return new Result<>(st.getCode(), st.getMsg() + ":" + e.getMessage());
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteClient.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteClient.java
deleted file mode 100644
index f8f685b4b3..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteClient.java
+++ /dev/null
@@ -1,62 +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.api.executor;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Component;
-
-/**
- * This is the main class for executing workflow/workflowInstance/tasks.
- * <pre>
- * ExecuteContext executeContext = ExecuteContext.builder()
- * .processInstance(processInstance)
- * .executeType(...)
- * .build();
- * executeClient.execute(executeContext);
- * </pre>
- */
-@Component
-@SuppressWarnings("unchecked")
-public class ExecuteClient {
-
- private final Map<ExecuteType, ExecuteFunctionBuilder> executorFunctionBuilderMap;
-
- public ExecuteClient(List<ExecuteFunctionBuilder> executeFunctionBuilders) {
- executorFunctionBuilderMap = executeFunctionBuilders.stream()
- .collect(Collectors.toMap(ExecuteFunctionBuilder::getExecuteType, Function.identity()));
- }
-
- public ExecuteResult executeWorkflowInstance(ExecuteContext executeContext) throws ExecuteRuntimeException {
- ExecuteFunctionBuilder<ExecuteRequest, ExecuteResult> executeFunctionBuilder = checkNotNull(
- executorFunctionBuilderMap.get(executeContext.getExecuteType()),
- String.format("The executeType: %s is not supported", executeContext.getExecuteType()));
-
- return executeFunctionBuilder.createWorkflowInstanceExecuteFunction(executeContext)
- .thenCombine(executeFunctionBuilder.createWorkflowInstanceExecuteRequest(executeContext),
- ExecuteFunction::execute)
- .join();
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteContext.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteContext.java
deleted file mode 100644
index 84c100b019..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteContext.java
+++ /dev/null
@@ -1,51 +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.api.executor;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.dao.entity.User;
-
-import lombok.Data;
-
-// todo: to be interface
-@Data
-public class ExecuteContext {
-
- private final ProcessInstance workflowInstance;
-
- private final ProcessDefinition workflowDefinition;
-
- private final User executeUser;
-
- private final ExecuteType executeType;
-
- public ExecuteContext(ProcessInstance workflowInstance,
- ProcessDefinition workflowDefinition,
- User executeUser,
- ExecuteType executeType) {
- this.workflowInstance = checkNotNull(workflowInstance, "workflowInstance cannot be null");
- this.workflowDefinition = checkNotNull(workflowDefinition, "workflowDefinition cannot be null");
- this.executeUser = checkNotNull(executeUser, "executeUser cannot be null");
- this.executeType = checkNotNull(executeType, "executeType cannot be null");
- }
-
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunctionBuilder.java
deleted file mode 100644
index 49dc9e9f8d..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,32 +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.api.executor;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-
-import java.util.concurrent.CompletableFuture;
-
-public interface ExecuteFunctionBuilder<Request extends ExecuteRequest, Result extends ExecuteResult> {
-
- CompletableFuture<ExecuteFunction<Request, Result>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext);
-
- CompletableFuture<Request> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext);
-
- ExecuteType getExecuteType();
-
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteRuntimeException.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteRuntimeException.java
deleted file mode 100644
index 1cdebb0952..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteRuntimeException.java
+++ /dev/null
@@ -1,46 +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.api.executor;
-
-// todo: implement from DolphinSchedulerRuntimeException
-public class ExecuteRuntimeException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- private static final String EXECUTE_WORKFLOW_INSTANCE_ERROR =
- "Execute workflow instance %s failed, execute type is %s";
-
- public ExecuteRuntimeException(String message) {
- super(message);
- }
-
- public ExecuteRuntimeException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public static ExecuteRuntimeException executeWorkflowInstanceError(ExecuteContext executeContext) {
- return executeWorkflowInstanceError(executeContext, null);
- }
-
- public static ExecuteRuntimeException executeWorkflowInstanceError(ExecuteContext executeContext, Throwable cause) {
- return new ExecuteRuntimeException(
- String.format(EXECUTE_WORKFLOW_INSTANCE_ERROR, executeContext.getWorkflowInstance().getName(),
- executeContext.getExecuteType()),
- cause);
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java
new file mode 100644
index 0000000000..478d6b98d9
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java
@@ -0,0 +1,139 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.validator.workflow.BackfillWorkflowDTO;
+import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
+import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
+import org.apache.dolphinscheduler.common.enums.RunMode;
+import org.apache.dolphinscheduler.common.utils.DateUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.repository.CommandDao;
+import org.apache.dolphinscheduler.extract.master.command.BackfillWorkflowCommandParam;
+import org.apache.dolphinscheduler.service.process.ProcessService;
+
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.google.common.collect.Lists;
+
+@Slf4j
+@Component
+public class BackfillWorkflowExecutorDelegate implements IExecutorDelegate<BackfillWorkflowDTO, Void> {
+
+ @Autowired
+ private CommandDao commandDao;
+
+ @Autowired
+ private ProcessService processService;
+
+ @Override
+ public Void execute(final BackfillWorkflowDTO backfillWorkflowDTO) {
+ // todo: directly call the master api to do backfill
+ if (backfillWorkflowDTO.getBackfillParams().getRunMode() == RunMode.RUN_MODE_SERIAL) {
+ doSerialBackfillWorkflow(backfillWorkflowDTO);
+ } else {
+ doParallemBackfillWorkflow(backfillWorkflowDTO);
+ }
+ return null;
+ }
+
+ private void doSerialBackfillWorkflow(final BackfillWorkflowDTO backfillWorkflowDTO) {
+ final BackfillWorkflowDTO.BackfillParamsDTO backfillParams = backfillWorkflowDTO.getBackfillParams();
+ final List<ZonedDateTime> backfillTimeList = backfillParams.getBackfillDateList();
+ if (backfillParams.getExecutionOrder() == ExecutionOrder.DESC_ORDER) {
+ Collections.sort(backfillTimeList, Collections.reverseOrder());
+ } else {
+ Collections.sort(backfillTimeList);
+ }
+
+ final BackfillWorkflowCommandParam backfillWorkflowCommandParam = BackfillWorkflowCommandParam.builder()
+ .commandParams(backfillWorkflowDTO.getStartParamList())
+ .startNodes(backfillWorkflowDTO.getStartNodes())
+ .backfillTimeList(backfillTimeList.stream().map(DateUtils::dateToString).collect(Collectors.toList()))
+ .timeZone(DateUtils.getTimezone())
+ .build();
+
+ doCreateCommand(backfillWorkflowDTO, backfillWorkflowCommandParam);
+ }
+
+ private void doParallemBackfillWorkflow(final BackfillWorkflowDTO backfillWorkflowDTO) {
+ final BackfillWorkflowDTO.BackfillParamsDTO backfillParams = backfillWorkflowDTO.getBackfillParams();
+ Integer expectedParallelismNumber = backfillParams.getExpectedParallelismNumber();
+
+ List<ZonedDateTime> listDate = backfillParams.getBackfillDateList();
+ if (expectedParallelismNumber != null) {
+ expectedParallelismNumber = Math.min(listDate.size(), expectedParallelismNumber);
+ } else {
+ expectedParallelismNumber = listDate.size();
+ }
+
+ log.info("In parallel mode, current expectedParallelismNumber:{}", expectedParallelismNumber);
+ for (List<ZonedDateTime> stringDate : Lists.partition(listDate, expectedParallelismNumber)) {
+ final BackfillWorkflowCommandParam backfillWorkflowCommandParam = BackfillWorkflowCommandParam.builder()
+ .commandParams(backfillWorkflowDTO.getStartParamList())
+ .startNodes(backfillWorkflowDTO.getStartNodes())
+ .backfillTimeList(stringDate.stream().map(DateUtils::dateToString).collect(Collectors.toList()))
+ .timeZone(DateUtils.getTimezone())
+ .build();
+ doCreateCommand(backfillWorkflowDTO, backfillWorkflowCommandParam);
+ }
+ }
+
+ private void doCreateCommand(final BackfillWorkflowDTO backfillWorkflowDTO,
+ final BackfillWorkflowCommandParam backfillWorkflowCommandParam) {
+ List<String> backfillTimeList = backfillWorkflowCommandParam.getBackfillTimeList();
+ final Command command = Command.builder()
+ .commandType(backfillWorkflowDTO.getExecType())
+ .processDefinitionCode(backfillWorkflowDTO.getWorkflowDefinition().getCode())
+ .processDefinitionVersion(backfillWorkflowDTO.getWorkflowDefinition().getVersion())
+ .executorId(backfillWorkflowDTO.getLoginUser().getId())
+ .scheduleTime(DateUtils.stringToDate(backfillTimeList.get(0)))
+ .commandParam(JSONUtils.toJsonString(backfillWorkflowCommandParam))
+ .taskDependType(backfillWorkflowDTO.getTaskDependType())
+ .failureStrategy(backfillWorkflowDTO.getFailureStrategy())
+ .warningType(backfillWorkflowDTO.getWarningType())
+ .warningGroupId(backfillWorkflowDTO.getWarningGroupId())
+ .startTime(new Date())
+ .processInstancePriority(backfillWorkflowDTO.getWorkflowInstancePriority())
+ .updateTime(new Date())
+ .workerGroup(backfillWorkflowDTO.getWorkerGroup())
+ .tenantCode(backfillWorkflowDTO.getTenantCode())
+ .dryRun(backfillWorkflowDTO.getDryRun().getCode())
+ .testFlag(backfillWorkflowDTO.getTestFlag().getCode())
+ .build();
+ commandDao.insert(command);
+ final BackfillWorkflowDTO.BackfillParamsDTO backfillParams = backfillWorkflowDTO.getBackfillParams();
+ if (backfillParams.getBackfillDependentMode() == ComplementDependentMode.ALL_DEPENDENT) {
+ doBackfillDependentWorkflow(backfillWorkflowCommandParam, command);
+ }
+ }
+
+ private void doBackfillDependentWorkflow(final BackfillWorkflowCommandParam backfillWorkflowCommandParam,
+ final Command backfillCommand) {
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/ExecutorClient.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/ExecutorClient.java
new file mode 100644
index 0000000000..2550623379
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/ExecutorClient.java
@@ -0,0 +1,79 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExecutorClient {
+
+ @Autowired
+ private TriggerWorkflowExecutorDelegate triggerWorkflowExecutorDelegate;
+
+ @Autowired
+ private BackfillWorkflowExecutorDelegate backfillWorkflowExecutorDelegate;
+
+ @Autowired
+ private RepeatRunningWorkflowInstanceExecutorDelegate repeatRunningWorkflowInstanceExecutorDelegate;
+
+ @Autowired
+ private RecoverFailureTaskInstanceExecutorDelegate recoverFailureTaskInstanceExecutorDelegate;
+
+ @Autowired
+ private RecoverSuspendedWorkflowInstanceExecutorDelegate recoverSuspendedWorkflowInstanceExecutorDelegate;
+
+ @Autowired
+ private PauseWorkflowInstanceExecutorDelegate pauseWorkflowInstanceExecutorDelegate;
+ @Autowired
+ private StopWorkflowInstanceExecutorDelegate stopWorkflowInstanceExecutorDelegate;
+
+ public TriggerWorkflowExecutorDelegate triggerWorkflowDefinition() {
+ return triggerWorkflowExecutorDelegate;
+ }
+
+ public BackfillWorkflowExecutorDelegate backfillWorkflowDefinition() {
+ return backfillWorkflowExecutorDelegate;
+ }
+
+ public RepeatRunningWorkflowInstanceExecutorDelegate.RepeatRunningWorkflowInstanceOperation repeatRunningWorkflowInstance() {
+ return new RepeatRunningWorkflowInstanceExecutorDelegate.RepeatRunningWorkflowInstanceOperation(
+ repeatRunningWorkflowInstanceExecutorDelegate);
+ }
+
+ public RecoverFailureTaskInstanceExecutorDelegate.RecoverFailureTaskInstanceOperation recoverFailureTaskInstance() {
+ return new RecoverFailureTaskInstanceExecutorDelegate.RecoverFailureTaskInstanceOperation(
+ recoverFailureTaskInstanceExecutorDelegate);
+ }
+
+ public RecoverSuspendedWorkflowInstanceExecutorDelegate.RecoverSuspendedWorkflowInstanceOperation recoverSuspendedWorkflowInstanceOperation() {
+ return new RecoverSuspendedWorkflowInstanceExecutorDelegate.RecoverSuspendedWorkflowInstanceOperation(
+ recoverSuspendedWorkflowInstanceExecutorDelegate);
+ }
+
+ public PauseWorkflowInstanceExecutorDelegate.PauseWorkflowInstanceOperation pauseWorkflowInstance() {
+ return new PauseWorkflowInstanceExecutorDelegate.PauseWorkflowInstanceOperation(
+ pauseWorkflowInstanceExecutorDelegate);
+ }
+
+ public StopWorkflowInstanceExecutorDelegate.StopWorkflowInstanceOperation stopWorkflowInstance() {
+ return new StopWorkflowInstanceExecutorDelegate.StopWorkflowInstanceOperation(
+ stopWorkflowInstanceExecutorDelegate);
+ }
+
+}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventType.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/IExecutorDelegate.java
similarity index 86%
rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventType.java
rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/IExecutorDelegate.java
index b0f5f09e30..06d1da1226 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventType.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/IExecutorDelegate.java
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.event;
+package org.apache.dolphinscheduler.api.executor.workflow;
-public enum WorkflowEventType {
-
- START_WORKFLOW,
- ;
+public interface IExecutorDelegate<T, R> {
+ R execute(T t);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/PauseWorkflowInstanceExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/PauseWorkflowInstanceExecutorDelegate.java
new file mode 100644
index 0000000000..4036f8b212
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/PauseWorkflowInstanceExecutorDelegate.java
@@ -0,0 +1,128 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+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.dao.repository.ProcessInstanceDao;
+import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
+import org.apache.dolphinscheduler.extract.master.IWorkflowInstanceController;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstancePauseRequest;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstancePauseResponse;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class PauseWorkflowInstanceExecutorDelegate
+ implements
+ IExecutorDelegate<PauseWorkflowInstanceExecutorDelegate.PauseWorkflowInstanceOperation, Void> {
+
+ @Autowired
+ private ProcessInstanceDao workflowInstanceDao;
+
+ @Override
+ public Void execute(PauseWorkflowInstanceOperation workflowInstanceControlRequest) {
+ final ProcessInstance workflowInstance = workflowInstanceControlRequest.workflowInstance;
+ exceptionIfWorkflowInstanceCannotPause(workflowInstance);
+ if (ifWorkflowInstanceCanDirectPauseInDB(workflowInstance)) {
+ directPauseInDB(workflowInstance);
+ } else {
+ pauseInMaster(workflowInstance);
+ }
+ return null;
+ }
+
+ private void exceptionIfWorkflowInstanceCannotPause(ProcessInstance workflowInstance) {
+ WorkflowExecutionStatus workflowInstanceState = workflowInstance.getState();
+ if (workflowInstanceState.canPause()) {
+ return;
+ }
+ throw new ServiceException(
+ "The workflow instance: " + workflowInstance.getName() + " status is " + workflowInstanceState
+ + ", can not pause");
+ }
+
+ private boolean ifWorkflowInstanceCanDirectPauseInDB(ProcessInstance workflowInstance) {
+ return workflowInstance.getState().canDirectPauseInDB();
+ }
+
+ private void directPauseInDB(ProcessInstance workflowInstance) {
+ workflowInstanceDao.updateWorkflowInstanceState(
+ workflowInstance.getId(),
+ workflowInstance.getState(),
+ WorkflowExecutionStatus.PAUSE);
+ log.info("Update workflow instance {} state from: {} to {} success",
+ workflowInstance.getName(),
+ workflowInstance.getState().name(),
+ WorkflowExecutionStatus.PAUSE.name());
+ }
+
+ private void pauseInMaster(ProcessInstance workflowInstance) {
+ try {
+ final WorkflowInstancePauseResponse pauseResponse = SingletonJdkDynamicRpcClientProxyFactory
+ .withService(IWorkflowInstanceController.class)
+ .withHost(workflowInstance.getHost())
+ .pauseWorkflowInstance(new WorkflowInstancePauseRequest(workflowInstance.getId()));
+
+ if (pauseResponse != null && pauseResponse.isSuccess()) {
+ log.info("WorkflowInstance: {} pause success", workflowInstance.getName());
+ } else {
+ throw new ServiceException(
+ "WorkflowInstance: " + workflowInstance.getName() + " pause failed: " + pauseResponse);
+ }
+ } catch (ServiceException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new ServiceException(
+ String.format("WorkflowInstance: %s pause failed", workflowInstance.getName()), e);
+ }
+ }
+
+ public static class PauseWorkflowInstanceOperation {
+
+ private final PauseWorkflowInstanceExecutorDelegate pauseWorkflowInstanceExecutorDelegate;
+
+ private ProcessInstance workflowInstance;
+
+ private User executeUser;
+
+ public PauseWorkflowInstanceOperation(PauseWorkflowInstanceExecutorDelegate pauseWorkflowInstanceExecutorDelegate) {
+ this.pauseWorkflowInstanceExecutorDelegate = pauseWorkflowInstanceExecutorDelegate;
+ }
+
+ public PauseWorkflowInstanceExecutorDelegate.PauseWorkflowInstanceOperation onWorkflowInstance(ProcessInstance workflowInstance) {
+ this.workflowInstance = workflowInstance;
+ return this;
+ }
+
+ public PauseWorkflowInstanceExecutorDelegate.PauseWorkflowInstanceOperation byUser(User executeUser) {
+ this.executeUser = executeUser;
+ return this;
+ }
+
+ public void execute() {
+ pauseWorkflowInstanceExecutorDelegate.execute(this);
+ }
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverFailureTaskInstanceExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverFailureTaskInstanceExecutorDelegate.java
new file mode 100644
index 0000000000..6a3dd86cb5
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverFailureTaskInstanceExecutorDelegate.java
@@ -0,0 +1,91 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.repository.CommandDao;
+
+import java.util.Date;
+
+import lombok.Getter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RecoverFailureTaskInstanceExecutorDelegate
+ implements
+ IExecutorDelegate<RecoverFailureTaskInstanceExecutorDelegate.RecoverFailureTaskInstanceOperation, Void> {
+
+ @Autowired
+ private CommandDao commandDao;
+
+ @Override
+ public Void execute(RecoverFailureTaskInstanceOperation recoverFailureTaskInstanceOperation) {
+ ProcessInstance workflowInstance = recoverFailureTaskInstanceOperation.getWorkflowInstance();
+ if (!workflowInstance.getState().isFailure()) {
+ throw new ServiceException(
+ String.format("The workflow instance: %s status is %s, can not be recovered",
+ workflowInstance.getName(), workflowInstance.getState()));
+ }
+
+ Command command = Command.builder()
+ .commandType(CommandType.START_FAILURE_TASK_PROCESS)
+ .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
+ .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
+ .processInstanceId(workflowInstance.getId())
+ .executorId(recoverFailureTaskInstanceOperation.getExecuteUser().getId())
+ .startTime(new Date())
+ .updateTime(new Date())
+ .build();
+ commandDao.insert(command);
+ return null;
+ }
+
+ @Getter
+ public static class RecoverFailureTaskInstanceOperation {
+
+ private final RecoverFailureTaskInstanceExecutorDelegate recoverFailureTaskInstanceExecutorDelegate;
+
+ private ProcessInstance workflowInstance;
+
+ private User executeUser;
+
+ public RecoverFailureTaskInstanceOperation(RecoverFailureTaskInstanceExecutorDelegate recoverFailureTaskInstanceExecutorDelegate) {
+ this.recoverFailureTaskInstanceExecutorDelegate = recoverFailureTaskInstanceExecutorDelegate;
+ }
+
+ public RecoverFailureTaskInstanceOperation onWorkflowInstance(ProcessInstance workflowInstance) {
+ this.workflowInstance = workflowInstance;
+ return this;
+ }
+
+ public RecoverFailureTaskInstanceOperation byUser(User executeUser) {
+ this.executeUser = executeUser;
+ return this;
+ }
+
+ public void execute() {
+ recoverFailureTaskInstanceExecutorDelegate.execute(this);
+ }
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverSuspendedWorkflowInstanceExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverSuspendedWorkflowInstanceExecutorDelegate.java
new file mode 100644
index 0000000000..25e048128a
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RecoverSuspendedWorkflowInstanceExecutorDelegate.java
@@ -0,0 +1,87 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.repository.CommandDao;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RecoverSuspendedWorkflowInstanceExecutorDelegate
+ implements
+ IExecutorDelegate<RecoverSuspendedWorkflowInstanceExecutorDelegate.RecoverSuspendedWorkflowInstanceOperation, Void> {
+
+ @Autowired
+ private CommandDao commandDao;
+
+ @Override
+ public Void execute(RecoverSuspendedWorkflowInstanceOperation workflowInstanceControlRequest) {
+ final ProcessInstance workflowInstance = workflowInstanceControlRequest.workflowInstance;
+ if (!workflowInstance.getState().isPause() && !workflowInstance.getState().isStop()) {
+ throw new ServiceException(
+ String.format("The workflow instance: %s state is %s, cannot recovery", workflowInstance.getName(),
+ workflowInstance.getState()));
+ }
+ final Command command = Command.builder()
+ .commandType(CommandType.RECOVER_SUSPENDED_PROCESS)
+ .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
+ .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
+ .processInstanceId(workflowInstance.getId())
+ .executorId(workflowInstanceControlRequest.executeUser.getId())
+ .startTime(new Date())
+ .updateTime(new Date())
+ .build();
+ commandDao.insert(command);
+ return null;
+ }
+
+ public static class RecoverSuspendedWorkflowInstanceOperation {
+
+ private final RecoverSuspendedWorkflowInstanceExecutorDelegate recoverSuspendedWorkflowInstanceExecutorDelegate;
+
+ private ProcessInstance workflowInstance;
+
+ private User executeUser;
+
+ public RecoverSuspendedWorkflowInstanceOperation(RecoverSuspendedWorkflowInstanceExecutorDelegate recoverSuspendedWorkflowInstanceExecutorDelegate) {
+ this.recoverSuspendedWorkflowInstanceExecutorDelegate = recoverSuspendedWorkflowInstanceExecutorDelegate;
+ }
+
+ public RecoverSuspendedWorkflowInstanceExecutorDelegate.RecoverSuspendedWorkflowInstanceOperation onWorkflowInstance(ProcessInstance workflowInstance) {
+ this.workflowInstance = workflowInstance;
+ return this;
+ }
+
+ public RecoverSuspendedWorkflowInstanceExecutorDelegate.RecoverSuspendedWorkflowInstanceOperation byUser(User executeUser) {
+ this.executeUser = executeUser;
+ return this;
+ }
+
+ public void execute() {
+ recoverSuspendedWorkflowInstanceExecutorDelegate.execute(this);
+ }
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RepeatRunningWorkflowInstanceExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RepeatRunningWorkflowInstanceExecutorDelegate.java
new file mode 100644
index 0000000000..623948cc9a
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/RepeatRunningWorkflowInstanceExecutorDelegate.java
@@ -0,0 +1,88 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.repository.CommandDao;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RepeatRunningWorkflowInstanceExecutorDelegate
+ implements
+ IExecutorDelegate<RepeatRunningWorkflowInstanceExecutorDelegate.RepeatRunningWorkflowInstanceOperation, Void> {
+
+ @Autowired
+ private CommandDao commandDao;
+
+ @Override
+ public Void execute(RepeatRunningWorkflowInstanceOperation workflowInstanceControlRequest) {
+ final ProcessInstance workflowInstance = workflowInstanceControlRequest.workflowInstance;
+ if (workflowInstance.getState() == null || !workflowInstance.getState().isFinished()) {
+ throw new ServiceException(
+ String.format("The workflow instance: %s status is %s, cannot repeat running",
+ workflowInstance.getName(), workflowInstance.getState()));
+ }
+ Command command = Command.builder()
+ .commandType(CommandType.REPEAT_RUNNING)
+ .processInstanceId(workflowInstance.getId())
+ .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
+ .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
+ .executorId(workflowInstanceControlRequest.executeUser.getId())
+ .startTime(new Date())
+ .updateTime(new Date())
+ .build();
+ commandDao.insert(command);
+ return null;
+ }
+
+ public static class RepeatRunningWorkflowInstanceOperation {
+
+ private final RepeatRunningWorkflowInstanceExecutorDelegate repeatRunningWorkflowInstanceExecutorDelegate;
+
+ private ProcessInstance workflowInstance;
+
+ private User executeUser;
+
+ public RepeatRunningWorkflowInstanceOperation(RepeatRunningWorkflowInstanceExecutorDelegate repeatRunningWorkflowInstanceExecutorDelegate) {
+ this.repeatRunningWorkflowInstanceExecutorDelegate = repeatRunningWorkflowInstanceExecutorDelegate;
+ }
+
+ public RepeatRunningWorkflowInstanceOperation onWorkflowInstance(ProcessInstance workflowInstance) {
+ this.workflowInstance = workflowInstance;
+ return this;
+ }
+
+ public RepeatRunningWorkflowInstanceOperation byUser(User executeUser) {
+ this.executeUser = executeUser;
+ return this;
+ }
+
+ public void execute() {
+ repeatRunningWorkflowInstanceExecutorDelegate.execute(this);
+ }
+ }
+
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecutorDelegate.java
new file mode 100644
index 0000000000..287c738367
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecutorDelegate.java
@@ -0,0 +1,129 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+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.dao.repository.ProcessInstanceDao;
+import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
+import org.apache.dolphinscheduler.extract.master.IWorkflowInstanceController;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStopRequest;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStopResponse;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class StopWorkflowInstanceExecutorDelegate
+ implements
+ IExecutorDelegate<StopWorkflowInstanceExecutorDelegate.StopWorkflowInstanceOperation, Void> {
+
+ @Autowired
+ private ProcessInstanceDao workflowInstanceDao;
+
+ @Override
+ public Void execute(StopWorkflowInstanceOperation workflowInstanceControlRequest) {
+ final ProcessInstance workflowInstance = workflowInstanceControlRequest.workflowInstance;
+ exceptionIfWorkflowInstanceCannotStop(workflowInstance);
+
+ if (ifWorkflowInstanceCanDirectStopInDB(workflowInstance)) {
+ directStopInDB(workflowInstance);
+ } else {
+ stopInMaster(workflowInstance);
+ }
+ return null;
+ }
+
+ void exceptionIfWorkflowInstanceCannotStop(ProcessInstance workflowInstance) {
+ final WorkflowExecutionStatus workflowInstanceState = workflowInstance.getState();
+ if (workflowInstanceState.canStop()) {
+ return;
+ }
+ throw new ServiceException(
+ "The workflow instance: " + workflowInstance.getName() + " status is " + workflowInstanceState
+ + ", can not stop");
+ }
+
+ boolean ifWorkflowInstanceCanDirectStopInDB(ProcessInstance workflowInstance) {
+ return workflowInstance.getState().canDirectStopInDB();
+ }
+
+ void directStopInDB(ProcessInstance workflowInstance) {
+ workflowInstanceDao.updateWorkflowInstanceState(
+ workflowInstance.getId(),
+ workflowInstance.getState(),
+ WorkflowExecutionStatus.STOP);
+ log.info("Update workflow instance {} state from: {} to {} success",
+ workflowInstance.getName(),
+ workflowInstance.getState().name(),
+ WorkflowExecutionStatus.STOP.name());
+ }
+
+ void stopInMaster(ProcessInstance workflowInstance) {
+ try {
+ final WorkflowInstanceStopResponse stopResponse = SingletonJdkDynamicRpcClientProxyFactory
+ .withService(IWorkflowInstanceController.class)
+ .withHost(workflowInstance.getHost())
+ .stopWorkflowInstance(new WorkflowInstanceStopRequest(workflowInstance.getId()));
+
+ if (stopResponse != null && stopResponse.isSuccess()) {
+ log.info("WorkflowInstance: {} stop success", workflowInstance.getName());
+ } else {
+ throw new ServiceException(
+ "WorkflowInstance: " + workflowInstance.getName() + " stop failed: " + stopResponse);
+ }
+ } catch (ServiceException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new ServiceException(
+ String.format("WorkflowInstance: %s stop failed", workflowInstance.getName()), e);
+ }
+ }
+
+ public static class StopWorkflowInstanceOperation {
+
+ private final StopWorkflowInstanceExecutorDelegate stopWorkflowInstanceExecutorDelegate;
+
+ private ProcessInstance workflowInstance;
+
+ private User executeUser;
+
+ public StopWorkflowInstanceOperation(StopWorkflowInstanceExecutorDelegate stopWorkflowInstanceExecutorDelegate) {
+ this.stopWorkflowInstanceExecutorDelegate = stopWorkflowInstanceExecutorDelegate;
+ }
+
+ public StopWorkflowInstanceExecutorDelegate.StopWorkflowInstanceOperation onWorkflowInstance(ProcessInstance workflowInstance) {
+ this.workflowInstance = workflowInstance;
+ return this;
+ }
+
+ public StopWorkflowInstanceExecutorDelegate.StopWorkflowInstanceOperation byUser(User executeUser) {
+ this.executeUser = executeUser;
+ return this;
+ }
+
+ public void execute() {
+ stopWorkflowInstanceExecutorDelegate.execute(this);
+ }
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/TriggerWorkflowExecutorDelegate.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/TriggerWorkflowExecutorDelegate.java
new file mode 100644
index 0000000000..15b31a8a31
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/TriggerWorkflowExecutorDelegate.java
@@ -0,0 +1,71 @@
+/*
+ * 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.api.executor.workflow;
+
+import org.apache.dolphinscheduler.api.validator.workflow.TriggerWorkflowDTO;
+import org.apache.dolphinscheduler.common.utils.DateUtils;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.repository.CommandDao;
+import org.apache.dolphinscheduler.extract.master.command.RunWorkflowCommandParam;
+import org.apache.dolphinscheduler.service.process.TriggerRelationService;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TriggerWorkflowExecutorDelegate implements IExecutorDelegate<TriggerWorkflowDTO, Void> {
+
+ @Autowired
+ private CommandDao commandDao;
+
+ @Autowired
+ private TriggerRelationService triggerRelationService;
+
+ @Override
+ public Void execute(TriggerWorkflowDTO triggerWorkflowDTO) {
+ final RunWorkflowCommandParam runWorkflowCommandParam =
+ RunWorkflowCommandParam.builder()
+ .commandParams(triggerWorkflowDTO.getStartParamList())
+ .startNodes(triggerWorkflowDTO.getStartNodes())
+ .timeZone(DateUtils.getTimezone())
+ .build();
+ final Command command = Command.builder()
+ .commandType(triggerWorkflowDTO.getExecType())
+ .processDefinitionCode(triggerWorkflowDTO.getWorkflowDefinition().getCode())
+ .processDefinitionVersion(triggerWorkflowDTO.getWorkflowDefinition().getVersion())
+ .executorId(triggerWorkflowDTO.getLoginUser().getId())
+ .commandParam(JSONUtils.toJsonString(runWorkflowCommandParam))
+ .taskDependType(triggerWorkflowDTO.getTaskDependType())
+ .failureStrategy(triggerWorkflowDTO.getFailureStrategy())
+ .warningType(triggerWorkflowDTO.getWarningType())
+ .warningGroupId(triggerWorkflowDTO.getWarningGroupId())
+ .startTime(new Date())
+ .processInstancePriority(triggerWorkflowDTO.getWorkflowInstancePriority())
+ .updateTime(new Date())
+ .workerGroup(triggerWorkflowDTO.getWorkerGroup())
+ .tenantCode(triggerWorkflowDTO.getTenantCode())
+ .dryRun(triggerWorkflowDTO.getDryRun().getCode())
+ .testFlag(triggerWorkflowDTO.getTestFlag().getCode())
+ .build();
+ commandDao.insert(command);
+ return null;
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunction.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunction.java
deleted file mode 100644
index 546e632b80..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunction.java
+++ /dev/null
@@ -1,64 +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.api.executor.workflow.instance.failure.recovery;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteRuntimeException;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.dao.entity.Command;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-public class FailureRecoveryExecuteFunction implements ExecuteFunction<FailureRecoveryRequest, FailureRecoveryResult> {
-
- private final CommandService commandService;
-
- public FailureRecoveryExecuteFunction(CommandService commandService) {
- this.commandService = commandService;
- }
-
- @Override
- public FailureRecoveryResult execute(FailureRecoveryRequest request) throws ExecuteRuntimeException {
- ProcessInstance workflowInstance = request.getWorkflowInstance();
- if (!workflowInstance.getState().isFailure()) {
- throw new ExecuteRuntimeException(
- String.format("The workflow instance: %s status is %s, can not be recovered",
- workflowInstance.getName(), workflowInstance.getState()));
- }
-
- Command command = Command.builder()
- .commandType(CommandType.START_FAILURE_TASK_PROCESS)
- .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
- .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
- .processInstanceId(workflowInstance.getId())
- .executorId(request.getExecuteUser().getId())
- .testFlag(workflowInstance.getTestFlag())
- .build();
- if (commandService.createCommand(command) <= 0) {
- throw new ExecuteRuntimeException(
- "Failure recovery workflow instance failed, due to insert command to db failed");
- }
- return new FailureRecoveryResult(command.getId());
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return FailureRecoveryExecuteFunctionBuilder.EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunctionBuilder.java
deleted file mode 100644
index 1509220bee..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/failure/recovery/FailureRecoveryExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,59 +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.api.executor.workflow.instance.failure.recovery;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunctionBuilder;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FailureRecoveryExecuteFunctionBuilder
- implements
- ExecuteFunctionBuilder<FailureRecoveryRequest, FailureRecoveryResult> {
-
- public static final ExecuteType EXECUTE_TYPE = ExecuteType.START_FAILURE_TASK_PROCESS;
-
- @Autowired
- private CommandService commandService;
-
- @Override
- public CompletableFuture<ExecuteFunction<FailureRecoveryRequest, FailureRecoveryResult>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(new FailureRecoveryExecuteFunction(commandService));
- }
-
- @Override
- public CompletableFuture<FailureRecoveryRequest> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(
- new FailureRecoveryRequest(
- executeContext.getWorkflowInstance(),
- executeContext.getWorkflowDefinition(),
- executeContext.getExecuteUser()));
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunction.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunction.java
deleted file mode 100644
index e8d6de590d..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunction.java
+++ /dev/null
@@ -1,79 +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.api.executor.workflow.instance.pause.pause;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteRuntimeException;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
-import org.apache.dolphinscheduler.extract.master.ITaskInstanceExecutionEventListener;
-import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStateChangeEvent;
-
-public class PauseExecuteFunction implements ExecuteFunction<PauseExecuteRequest, PauseExecuteResult> {
-
- private final ProcessInstanceDao processInstanceDao;
-
- public PauseExecuteFunction(ProcessInstanceDao processInstanceDao) {
- this.processInstanceDao = processInstanceDao;
- }
-
- @Override
- public PauseExecuteResult execute(PauseExecuteRequest request) throws ExecuteRuntimeException {
- ProcessInstance workflowInstance = request.getWorkflowInstance();
- if (!workflowInstance.getState().isRunning()) {
- throw new ExecuteRuntimeException(
- String.format("The workflow instance: %s status is %s, can not pause", workflowInstance.getName(),
- workflowInstance.getState()));
- }
- workflowInstance.setCommandType(CommandType.PAUSE);
- workflowInstance.addHistoryCmd(CommandType.PAUSE);
- workflowInstance.setStateWithDesc(WorkflowExecutionStatus.READY_PAUSE,
- CommandType.PAUSE.getDescp() + " by " + request.getExecuteUser().getUserName());
-
- if (!processInstanceDao.updateById(workflowInstance)) {
- throw new ExecuteRuntimeException(
- String.format(
- "The workflow instance: %s pause failed, due to update the workflow instance status in DB failed",
- workflowInstance.getName()));
- }
- try {
- // todo: direct call the workflow instance pause method
- ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
- SingletonJdkDynamicRpcClientProxyFactory
- .getProxyClient(workflowInstance.getHost(), ITaskInstanceExecutionEventListener.class);
- iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(
- new WorkflowInstanceStateChangeEvent(
- workflowInstance.getId(), 0, workflowInstance.getState(), workflowInstance.getId(), 0));
- } catch (Exception e) {
- throw new ExecuteRuntimeException(
- String.format(
- "WorkflowInstance: %s pause failed", workflowInstance.getName()),
- e);
- }
- return new PauseExecuteResult(workflowInstance);
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return PauseExecuteFunctionBuilder.EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunctionBuilder.java
deleted file mode 100644
index 65102fb853..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,57 +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.api.executor.workflow.instance.pause.pause;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunctionBuilder;
-import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class PauseExecuteFunctionBuilder implements ExecuteFunctionBuilder<PauseExecuteRequest, PauseExecuteResult> {
-
- public static final ExecuteType EXECUTE_TYPE = ExecuteType.PAUSE;
-
- @Autowired
- private ProcessInstanceDao processInstanceDao;
-
- @Override
- public CompletableFuture<ExecuteFunction<PauseExecuteRequest, PauseExecuteResult>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(new PauseExecuteFunction(processInstanceDao));
- }
-
- @Override
- public CompletableFuture<PauseExecuteRequest> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(
- new PauseExecuteRequest(
- executeContext.getWorkflowDefinition(),
- executeContext.getWorkflowInstance(),
- executeContext.getExecuteUser()));
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteRequest.java
deleted file mode 100644
index 02cb471961..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteRequest.java
+++ /dev/null
@@ -1,35 +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.api.executor.workflow.instance.pause.pause;
-
-import org.apache.dolphinscheduler.api.executor.ExecuteRequest;
-import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.dao.entity.User;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class PauseExecuteRequest implements ExecuteRequest {
-
- private final ProcessDefinition processDefinition;
- private final ProcessInstance workflowInstance;
- private final User executeUser;
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteResult.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteResult.java
deleted file mode 100644
index 38bbc03c07..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/pause/PauseExecuteResult.java
+++ /dev/null
@@ -1,29 +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.api.executor.workflow.instance.pause.pause;
-
-import org.apache.dolphinscheduler.api.executor.ExecuteResult;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-
-import lombok.AllArgsConstructor;
-
-@AllArgsConstructor
-public class PauseExecuteResult implements ExecuteResult {
-
- private final ProcessInstance processInstance;
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunction.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunction.java
deleted file mode 100644
index 34bd2561b1..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunction.java
+++ /dev/null
@@ -1,78 +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.api.executor.workflow.instance.pause.recover;
-
-import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteRuntimeException;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.dao.entity.Command;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-import java.util.Map;
-
-import com.google.common.collect.ImmutableMap;
-
-public class RecoverExecuteFunction implements ExecuteFunction<RecoverExecuteRequest, RecoverExecuteResult> {
-
- private final CommandService commandService;
-
- public RecoverExecuteFunction(CommandService commandService) {
- this.commandService = commandService;
- }
-
- @Override
- public RecoverExecuteResult execute(RecoverExecuteRequest request) throws ExecuteRuntimeException {
- ProcessInstance workflowInstance = request.getWorkflowInstance();
- if (!(workflowInstance.getState().isPause() || workflowInstance.getState().isStop())) {
- throw new ExecuteRuntimeException(
- String.format("The workflow instance: %s state is %s, cannot recovery", workflowInstance.getName(),
- workflowInstance.getState()));
- }
- Command command = Command.builder()
- .commandType(CommandType.RECOVER_SUSPENDED_PROCESS)
- .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
- .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
- .processInstanceId(workflowInstance.getId())
- .commandParam(JSONUtils.toJsonString(createCommandParam(workflowInstance)))
- .executorId(request.getExecuteUser().getId())
- .testFlag(workflowInstance.getTestFlag())
- .build();
- if (commandService.createCommand(command) <= 0) {
- throw new ExecuteRuntimeException(
- String.format("Recovery workflow instance: %s failed, due to insert command to db failed",
- workflowInstance.getName()));
- }
- return new RecoverExecuteResult(command);
- }
-
- private Map<String, Object> createCommandParam(ProcessInstance workflowInstance) {
- return new ImmutableMap.Builder<String, Object>()
- .put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, workflowInstance.getId())
- .build();
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return RecoverExecuteFunctionBuilder.EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunctionBuilder.java
deleted file mode 100644
index cbd88a0d2d..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/pause/recover/RecoverExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,60 +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.api.executor.workflow.instance.pause.recover;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunctionBuilder;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RecoverExecuteFunctionBuilder
- implements
- ExecuteFunctionBuilder<RecoverExecuteRequest, RecoverExecuteResult> {
-
- public static final ExecuteType EXECUTE_TYPE = ExecuteType.RECOVER_SUSPENDED_PROCESS;
-
- @Autowired
- private CommandService commandService;
-
- @Override
- public CompletableFuture<ExecuteFunction<RecoverExecuteRequest, RecoverExecuteResult>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(
- new RecoverExecuteFunction(commandService));
- }
-
- @Override
- public CompletableFuture<RecoverExecuteRequest> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(
- new RecoverExecuteRequest(
- executeContext.getWorkflowInstance(),
- executeContext.getWorkflowDefinition(),
- executeContext.getExecuteUser()));
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunction.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunction.java
deleted file mode 100644
index 82c59b907f..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunction.java
+++ /dev/null
@@ -1,93 +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.api.executor.workflow.instance.rerun;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
-import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_START_PARAMS;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteRuntimeException;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.dao.entity.Command;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-
-public class RepeatRunningExecuteFunction implements ExecuteFunction<RepeatRunningRequest, RepeatRunningResult> {
-
- private final CommandService commandService;
-
- public RepeatRunningExecuteFunction(CommandService commandService) {
- this.commandService = commandService;
- }
-
- @Override
- public RepeatRunningResult execute(RepeatRunningRequest request) throws ExecuteRuntimeException {
- checkNotNull(request, "request cannot be null");
- // todo: check workflow definition valid? or we don't need to do this check, since we will check in master
- // again.
- // todo: check tenant valid? or we don't need to do this check, since we need to check in master again.
- ProcessInstance workflowInstance = request.getWorkflowInstance();
- if (workflowInstance.getState() == null || !workflowInstance.getState().isFinished()) {
- throw new ExecuteRuntimeException(
- String.format("The workflow instance: %s status is %s, cannot repeat running",
- workflowInstance.getName(), workflowInstance.getState()));
- }
- Command command = Command.builder()
- .commandType(CommandType.REPEAT_RUNNING)
- .commandParam(JSONUtils.toJsonString(createCommandParams(workflowInstance)))
- .processDefinitionCode(workflowInstance.getProcessDefinitionCode())
- .processDefinitionVersion(workflowInstance.getProcessDefinitionVersion())
- .processInstanceId(workflowInstance.getId())
- .processInstancePriority(workflowInstance.getProcessInstancePriority())
- .testFlag(workflowInstance.getTestFlag())
- .build();
- if (commandService.createCommand(command) <= 0) {
- throw new ExecuteRuntimeException(
- String.format("Repeat running workflow instance: %s failed, due to insert command to db failed",
- workflowInstance.getName()));
- }
- return new RepeatRunningResult(command.getId());
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return RepeatRunningExecuteFunctionBuilder.EXECUTE_TYPE;
- }
-
- private Map<String, Object> createCommandParams(ProcessInstance workflowInstance) {
- Map<String, Object> commandMap =
- JSONUtils.parseObject(workflowInstance.getCommandParam(), new TypeReference<Map<String, Object>>() {
- });
- Map<String, Object> repeatRunningCommandParams = new HashMap<>();
- Optional.ofNullable(MapUtils.getObject(commandMap, CMD_PARAM_START_PARAMS))
- .ifPresent(startParams -> repeatRunningCommandParams.put(CMD_PARAM_START_PARAMS, startParams));
- repeatRunningCommandParams.put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, workflowInstance.getId());
- return repeatRunningCommandParams;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunctionBuilder.java
deleted file mode 100644
index f5363f90da..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,59 +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.api.executor.workflow.instance.rerun;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunctionBuilder;
-import org.apache.dolphinscheduler.service.command.CommandService;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class RepeatRunningExecuteFunctionBuilder
- implements
- ExecuteFunctionBuilder<RepeatRunningRequest, RepeatRunningResult> {
-
- public static final ExecuteType EXECUTE_TYPE = ExecuteType.REPEAT_RUNNING;
-
- @Autowired
- private CommandService commandService;
-
- @Override
- public CompletableFuture<ExecuteFunction<RepeatRunningRequest, RepeatRunningResult>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(new RepeatRunningExecuteFunction(commandService));
- }
-
- @Override
- public CompletableFuture<RepeatRunningRequest> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(
- new RepeatRunningRequest(
- executeContext.getWorkflowInstance(),
- executeContext.getWorkflowDefinition(),
- executeContext.getExecuteUser()));
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunction.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunction.java
deleted file mode 100644
index 1ad0f9ae7a..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunction.java
+++ /dev/null
@@ -1,83 +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.api.executor.workflow.instance.stop;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteRuntimeException;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
-import org.apache.dolphinscheduler.extract.master.ITaskInstanceExecutionEventListener;
-import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStateChangeEvent;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class StopExecuteFunction implements ExecuteFunction<StopRequest, StopResult> {
-
- private final ProcessInstanceDao processInstanceDao;
-
- public StopExecuteFunction(ProcessInstanceDao processInstanceDao) {
- this.processInstanceDao = processInstanceDao;
- }
-
- @Override
- public StopResult execute(StopRequest request) throws ExecuteRuntimeException {
- ProcessInstance workflowInstance = request.getWorkflowInstance();
-
- if (!workflowInstance.getState().canStop()
- || workflowInstance.getState() == WorkflowExecutionStatus.READY_STOP) {
- throw new ExecuteRuntimeException(
- String.format("The workflow instance: %s status is %s, can not be stopped",
- workflowInstance.getName(), workflowInstance.getState()));
- }
- // update the workflow instance's status to stop
- workflowInstance.setCommandType(CommandType.STOP);
- workflowInstance.addHistoryCmd(CommandType.STOP);
- workflowInstance.setStateWithDesc(WorkflowExecutionStatus.READY_STOP, CommandType.STOP.getDescp() + " by user");
- if (processInstanceDao.updateById(workflowInstance)) {
- log.info("Workflow instance {} ready to stop success, will call master to stop the workflow instance",
- workflowInstance.getName());
- try {
- // todo: direct call the workflow instance stop method
- ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
- SingletonJdkDynamicRpcClientProxyFactory.getProxyClient(workflowInstance.getHost(),
- ITaskInstanceExecutionEventListener.class);
- iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(
- new WorkflowInstanceStateChangeEvent(
- workflowInstance.getId(), 0, workflowInstance.getState(), workflowInstance.getId(), 0));
- } catch (Exception e) {
- throw new ExecuteRuntimeException(
- String.format("WorkflowInstance: %s stop failed", workflowInstance.getName()), e);
- }
- // todo: use async and inject the completeFuture in the result.
- return new StopResult(workflowInstance);
- }
- throw new ExecuteRuntimeException(
- "Workflow instance stop failed, due to update the workflow instance status failed");
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return StopExecuteFunctionBuilder.EXECUTE_TYPE;
- }
-
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunctionBuilder.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunctionBuilder.java
deleted file mode 100644
index fa9f72aa71..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopExecuteFunctionBuilder.java
+++ /dev/null
@@ -1,53 +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.api.executor.workflow.instance.stop;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunction;
-import org.apache.dolphinscheduler.api.executor.ExecuteFunctionBuilder;
-import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class StopExecuteFunctionBuilder implements ExecuteFunctionBuilder<StopRequest, StopResult> {
-
- public static final ExecuteType EXECUTE_TYPE = ExecuteType.STOP;
-
- @Autowired
- private ProcessInstanceDao processInstanceDao;
-
- @Override
- public CompletableFuture<ExecuteFunction<StopRequest, StopResult>> createWorkflowInstanceExecuteFunction(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(new StopExecuteFunction(processInstanceDao));
- }
-
- @Override
- public CompletableFuture<StopRequest> createWorkflowInstanceExecuteRequest(ExecuteContext executeContext) {
- return CompletableFuture.completedFuture(new StopRequest(executeContext.getWorkflowInstance()));
- }
-
- @Override
- public ExecuteType getExecuteType() {
- return EXECUTE_TYPE;
- }
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopResult.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopResult.java
deleted file mode 100644
index cf7ddb237e..0000000000
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/stop/StopResult.java
+++ /dev/null
@@ -1,33 +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.api.executor.workflow.instance.stop;
-
-import org.apache.dolphinscheduler.api.executor.ExecuteResult;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NonNull;
-
-@Data
-@AllArgsConstructor
-public class StopResult implements ExecuteResult {
-
- @NonNull
- private final ProcessInstance workflowInstance;
-}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
index a2ad908e47..ba03f92f30 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
@@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.api.python;
import org.apache.dolphinscheduler.api.configuration.ApiConfig;
import org.apache.dolphinscheduler.api.dto.EnvironmentDto;
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowTriggerRequest;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.EnvironmentService;
@@ -382,30 +383,14 @@ public class PythonGateway {
// make sure workflow online
processDefinitionService.onlineWorkflowDefinition(user, project.getCode(), processDefinition.getCode());
- executorService.execProcessInstance(user,
- project.getCode(),
- processDefinition.getCode(),
- cronTime,
- null,
- DEFAULT_FAILURE_STRATEGY,
- null,
- DEFAULT_TASK_DEPEND_TYPE,
- WarningType.valueOf(warningType),
- warningGroupId,
- DEFAULT_RUN_MODE,
- DEFAULT_PRIORITY,
- workerGroup,
- user.getTenantCode(),
- DEFAULT_ENVIRONMENT_CODE,
- timeout,
- null,
- null,
- DEFAULT_DRY_RUN,
- DEFAULT_TEST_FLAG,
- COMPLEMENT_DEPENDENT_MODE,
- processDefinition.getVersion(),
- false,
- DEFAULT_EXECUTION_ORDER);
+ WorkflowTriggerRequest workflowTriggerRequest = WorkflowTriggerRequest.builder()
+ .loginUser(user)
+ .workflowDefinitionCode(processDefinition.getCode())
+ .workerGroup(workerGroup)
+ .warningType(WarningType.of(warningType))
+ .warningGroupId(warningGroupId)
+ .build();
+ executorService.triggerWorkflowDefinition(workflowTriggerRequest);
}
// side object
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 55ca697412..306f8f87e5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -17,123 +17,63 @@
package org.apache.dolphinscheduler.api.service;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowBackFillRequest;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowTriggerRequest;
import org.apache.dolphinscheduler.api.dto.workflowInstance.WorkflowExecuteResponse;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
-import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
-import org.apache.dolphinscheduler.common.enums.FailureStrategy;
-import org.apache.dolphinscheduler.common.enums.Priority;
-import org.apache.dolphinscheduler.common.enums.RunMode;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
-import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.extract.master.dto.WorkflowExecuteDto;
-import org.apache.dolphinscheduler.plugin.task.api.model.Property;
-import java.util.List;
import java.util.Map;
-/**
- * executor service
- */
public interface ExecutorService {
/**
- * execute process instance
- *
- * @param loginUser login user
- * @param projectCode project code
- * @param processDefinitionCode process definition code
- * @param cronTime cron time
- * @param commandType command type
- * @param failureStrategy failure strategy
- * @param startNodeList start nodelist
- * @param taskDependType node dependency type
- * @param warningType warning type
- * @param warningGroupId notify group id
- * @param processInstancePriority process instance priority
- * @param workerGroup worker group name
- * @param tenantCode tenant code
- * @param environmentCode environment code
- * @param runMode run mode
- * @param timeout timeout
- * @param startParamList the global param values which pass to new process instance
- * @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
- * @param executionOrder the execution order when complementing data
- * @return execute process instance code
+ * Trigger the workflow and return the trigger code.
+ */
+ Long triggerWorkflowDefinition(final WorkflowTriggerRequest workflowTriggerRequest);
+
+ /**
+ * Backfill the workflow and return the trigger code.
*/
- Map<String, Object> execProcessInstance(User loginUser, long projectCode,
- long processDefinitionCode, String cronTime, CommandType commandType,
- FailureStrategy failureStrategy, String startNodeList,
- TaskDependType taskDependType, WarningType warningType,
- Integer warningGroupId,
- RunMode runMode,
- Priority processInstancePriority, String workerGroup, String tenantCode,
- Long environmentCode,
- Integer timeout,
- List<Property> startParamList, Integer expectedParallelismNumber,
- int dryRun, int testFlag,
- ComplementDependentMode complementDependentMode, Integer version,
- boolean allLevelDependent, ExecutionOrder executionOrder);
+ Long backfillWorkflowDefinition(final WorkflowBackFillRequest workflowBackFillRequest);
/**
* check whether the process definition can be executed
*
- * @param projectCode project code
+ * @param projectCode project code
* @param processDefinition process definition
* @param processDefineCode process definition code
- * @param version process definition version
+ * @param version process definition version
*/
void checkProcessDefinitionValid(long projectCode, ProcessDefinition processDefinition, long processDefineCode,
Integer version);
- /**
- * do action to process instance：pause, stop, repeat, recover from pause, recover from stop
- *
- * @param loginUser login user
- * @param projectCode project code
- * @param processInstanceId process instance id
- * @param executeType execute type
- * @return execute result code
- */
- Map<String, Object> execute(User loginUser, long projectCode, Integer processInstanceId, ExecuteType executeType);
-
/**
* do action to execute task in process instance
*
- * @param loginUser login user
- * @param projectCode project code
+ * @param loginUser login user
+ * @param projectCode project code
* @param processInstanceId process instance id
- * @param startNodeList start node list
- * @param taskDependType task depend type
+ * @param startNodeList start node list
+ * @param taskDependType task depend type
* @return execute result code
*/
- WorkflowExecuteResponse executeTask(User loginUser, long projectCode, Integer processInstanceId,
+ WorkflowExecuteResponse executeTask(User loginUser,
+ long projectCode,
+ Integer processInstanceId,
String startNodeList,
TaskDependType taskDependType);
/**
- * do action to process instance：pause, stop, repeat, recover from pause, recover from stop
- *
- * @param loginUser login user
- * @param workflowInstanceId workflow instance id
- * @param executeType execute type
- * @return execute result code
- */
- Map<String, Object> execute(User loginUser, Integer workflowInstanceId, ExecuteType executeType);
-
- /**
- * check if sub processes are offline before starting process definition
- *
- * @param processDefinitionCode process definition code
- * @return check result code
+ * Control workflow instance, you can use this interface to pause, stop, repeat, recover a workflow instance.
*/
- Map<String, Object> startCheckByProcessDefinedCode(long processDefinitionCode);
+ void controlWorkflowInstance(User loginUser, Integer workflowInstanceId, ExecuteType executeType);
/**
* check if the current process has subprocesses and all subprocesses are valid
+ *
* @param processDefinition
* @return check result
*/
@@ -141,29 +81,23 @@ public interface ExecutorService {
/**
* force start Task Instance
+ *
* @param loginUser
* @param queueId
* @return
*/
Map<String, Object> forceStartTaskInstance(User loginUser, int queueId);
- /**
- * query executing workflow data in Master memory
- * @param processInstanceId
- * @return
- */
- WorkflowExecuteDto queryExecutingWorkflowByProcessInstanceId(Integer processInstanceId);
-
/**
* execute stream task instance
*
- * @param loginUser login user
- * @param projectCode project code
- * @param warningGroupId notify group id
- * @param workerGroup worker group name
- * @param tenantCode tenant code
+ * @param loginUser login user
+ * @param projectCode project code
+ * @param warningGroupId notify group id
+ * @param workerGroup worker group name
+ * @param tenantCode tenant code
* @param environmentCode environment code
- * @param startParams the global param values which pass to new process instance
+ * @param startParams the global param values which pass to new process instance
* @return execute process instance code
*/
void execStreamTaskInstance(User loginUser, long projectCode,
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 64f43e5d81..176f9326d1 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
@@ -18,48 +18,43 @@
package org.apache.dolphinscheduler.api.service.impl;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_START;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_START_NODES;
-import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_START_PARAMS;
import static org.apache.dolphinscheduler.common.constants.CommandKeyConstants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
import static org.apache.dolphinscheduler.common.constants.Constants.COMMA;
-import static org.apache.dolphinscheduler.common.constants.Constants.MAX_TASK_TIMEOUT;
-import static org.apache.dolphinscheduler.common.constants.Constants.SCHEDULE_TIME_MAX_LENGTH;
import org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowBackFillRequest;
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowTriggerRequest;
import org.apache.dolphinscheduler.api.dto.workflowInstance.WorkflowExecuteResponse;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
-import org.apache.dolphinscheduler.api.executor.ExecuteClient;
-import org.apache.dolphinscheduler.api.executor.ExecuteContext;
+import org.apache.dolphinscheduler.api.executor.workflow.ExecutorClient;
import org.apache.dolphinscheduler.api.service.ExecutorService;
import org.apache.dolphinscheduler.api.service.MonitorService;
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
import org.apache.dolphinscheduler.api.service.ProcessLineageService;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.api.service.WorkerGroupService;
+import org.apache.dolphinscheduler.api.validator.workflow.BackfillWorkflowDTO;
+import org.apache.dolphinscheduler.api.validator.workflow.BackfillWorkflowDTOValidator;
+import org.apache.dolphinscheduler.api.validator.workflow.BackfillWorkflowRequestTransformer;
+import org.apache.dolphinscheduler.api.validator.workflow.TriggerWorkflowDTO;
+import org.apache.dolphinscheduler.api.validator.workflow.TriggerWorkflowDTOValidator;
+import org.apache.dolphinscheduler.api.validator.workflow.TriggerWorkflowRequestTransformer;
import org.apache.dolphinscheduler.common.constants.Constants;
-import org.apache.dolphinscheduler.common.enums.ApiTriggerType;
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.ExecutionOrder;
-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.WarningType;
-import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-import org.apache.dolphinscheduler.common.model.Server;
-import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.Command;
@@ -67,7 +62,6 @@ import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
-import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
@@ -82,17 +76,7 @@ import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-import org.apache.dolphinscheduler.extract.base.client.SingletonJdkDynamicRpcClientProxyFactory;
-import org.apache.dolphinscheduler.extract.master.IStreamingTaskOperator;
-import org.apache.dolphinscheduler.extract.master.ITaskInstanceExecutionEventListener;
-import org.apache.dolphinscheduler.extract.master.IWorkflowInstanceService;
-import org.apache.dolphinscheduler.extract.master.dto.WorkflowExecuteDto;
-import org.apache.dolphinscheduler.extract.master.transportor.StreamingTaskTriggerRequest;
-import org.apache.dolphinscheduler.extract.master.transportor.StreamingTaskTriggerResponse;
-import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStateChangeEvent;
-import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.utils.TaskTypeUtils;
-import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
import org.apache.dolphinscheduler.service.command.CommandService;
import org.apache.dolphinscheduler.service.cron.CronUtils;
import org.apache.dolphinscheduler.service.exceptions.CronParseException;
@@ -105,7 +89,6 @@ import org.apache.commons.lang3.StringUtils;
import java.time.ZonedDateTime;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -125,9 +108,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.google.common.base.Splitter;
-/**
- * executor service impl
- */
@Service
@Slf4j
public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorService {
@@ -181,143 +161,45 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
@Autowired
private TriggerRelationService triggerRelationService;
- @Autowired
- private ExecuteClient executeClient;
-
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProcessLineageService processLineageService;
- /**
- * execute process instance
- *
- * @param loginUser login user
- * @param projectCode project code
- * @param processDefinitionCode process definition code
- * @param cronTime cron time
- * @param commandType command type
- * @param failureStrategy failure strategy
- * @param startNodeList start nodelist
- * @param taskDependType node dependency type
- * @param warningType warning type
- * @param warningGroupId notify group id
- * @param processInstancePriority process instance priority
- * @param workerGroup worker group name
- * @param tenantCode tenant code
- * @param environmentCode environment code
- * @param runMode run mode
- * @param timeout timeout
- * @param startParamList the global param values which pass to new process instance
- * @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
- * @param testFlag testFlag
- * @param executionOrder the execution order when complementing data
- * @return execute process instance code
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Map<String, Object> execProcessInstance(User loginUser, long projectCode, long processDefinitionCode,
- String cronTime, CommandType commandType,
- FailureStrategy failureStrategy, String startNodeList,
- TaskDependType taskDependType, WarningType warningType,
- Integer warningGroupId, RunMode runMode,
- Priority processInstancePriority, String workerGroup,
- String tenantCode,
- Long environmentCode, Integer timeout,
- List<Property> startParamList, Integer expectedParallelismNumber,
- int dryRun, int testFlag,
- ComplementDependentMode complementDependentMode, Integer version,
- boolean allLevelDependent, ExecutionOrder executionOrder) {
- Project project = projectMapper.queryByCode(projectCode);
- // check user access for project
- projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START);
-
- Map<String, Object> result = new HashMap<>();
- // timeout is invalid
- if (timeout <= 0 || timeout > MAX_TASK_TIMEOUT) {
- log.warn("Parameter timeout is invalid, timeout:{}.", timeout);
- putMsg(result, Status.TASK_TIMEOUT_PARAMS_ERROR);
- return result;
- }
+ @Autowired
+ private TriggerWorkflowRequestTransformer triggerWorkflowRequestTransformer;
- if (Objects.nonNull(expectedParallelismNumber) && expectedParallelismNumber <= 0) {
- log.warn("Parameter expectedParallelismNumber is invalid, expectedParallelismNumber:{}.",
- expectedParallelismNumber);
- putMsg(result, Status.TASK_PARALLELISM_PARAMS_ERROR);
- return result;
- }
+ @Autowired
+ private TriggerWorkflowDTOValidator triggerWorkflowDTOValidator;
- checkValidTenant(tenantCode);
- ProcessDefinition processDefinition;
- if (null != version) {
- processDefinition = processService.findProcessDefinition(processDefinitionCode, version);
- } else {
- processDefinition = processDefinitionMapper.queryByCode(processDefinitionCode);
- }
- // check process define release state
- this.checkProcessDefinitionValid(projectCode, processDefinition, processDefinitionCode,
- processDefinition.getVersion());
- // check current version whether include startNodeList
- checkStartNodeList(startNodeList, processDefinitionCode, processDefinition.getVersion());
-
- checkScheduleTimeNumExceed(commandType, cronTime);
- checkMasterExists();
-
- long triggerCode = CodeGenerateUtils.genCode();
-
- /**
- * create command
- */
- int create =
- this.createCommand(triggerCode, commandType, processDefinition.getCode(), taskDependType,
- failureStrategy,
- startNodeList,
- cronTime, warningType, loginUser.getId(), warningGroupId, runMode, processInstancePriority,
- workerGroup, tenantCode,
- environmentCode, startParamList, expectedParallelismNumber, dryRun, testFlag,
- complementDependentMode, allLevelDependent, executionOrder);
+ @Autowired
+ private BackfillWorkflowRequestTransformer backfillWorkflowRequestTransformer;
- if (create > 0) {
- processDefinition.setWarningGroupId(warningGroupId);
- processDefinitionMapper.updateById(processDefinition);
- log.info("Create command complete, processDefinitionCode:{}, commandCount:{}.",
- processDefinition.getCode(), create);
- result.put(Constants.DATA_LIST, triggerCode);
- putMsg(result, Status.SUCCESS);
- } else {
- log.error("Start process instance failed because create command error, processDefinitionCode:{}.",
- processDefinition.getCode());
- putMsg(result, Status.START_PROCESS_INSTANCE_ERROR);
- }
- return result;
- }
+ @Autowired
+ private BackfillWorkflowDTOValidator backfillWorkflowDTOValidator;
- private void checkMasterExists() {
- // check master server exists
- List<Server> masterServers = monitorService.listServer(RegistryNodeType.MASTER);
+ @Autowired
+ private ExecutorClient executorClient;
- // no master
- if (masterServers.isEmpty()) {
- throw new ServiceException(Status.MASTER_NOT_EXISTS);
- }
+ @Override
+ @Transactional
+ public Long triggerWorkflowDefinition(final WorkflowTriggerRequest workflowTriggerRequest) {
+ final TriggerWorkflowDTO triggerWorkflowDTO =
+ triggerWorkflowRequestTransformer.transform(workflowTriggerRequest);
+ triggerWorkflowDTOValidator.validate(triggerWorkflowDTO);
+ executorClient.triggerWorkflowDefinition().execute(triggerWorkflowDTO);
+ return triggerWorkflowDTO.getTriggerCode();
}
- private void checkScheduleTimeNumExceed(CommandType complementData, String cronTime) {
- if (!CommandType.COMPLEMENT_DATA.equals(complementData)) {
- return;
- }
- if (cronTime == null) {
- return;
- }
- Map<String, String> cronMap = JSONUtils.toMap(cronTime);
- if (cronMap.containsKey(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) {
- String[] stringDates = cronMap.get(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST).split(COMMA);
- if (stringDates.length > SCHEDULE_TIME_MAX_LENGTH) {
- log.warn("Parameter cornTime is bigger than {}.", SCHEDULE_TIME_MAX_LENGTH);
- throw new ServiceException(Status.SCHEDULE_TIME_NUMBER_EXCEED);
- }
- }
+ @Override
+ @Transactional
+ public Long backfillWorkflowDefinition(final WorkflowBackFillRequest workflowBackFillRequest) {
+ final BackfillWorkflowDTO backfillWorkflowDTO =
+ backfillWorkflowRequestTransformer.transform(workflowBackFillRequest);
+ backfillWorkflowDTOValidator.validate(backfillWorkflowDTO);
+ executorClient.backfillWorkflowDefinition().execute(backfillWorkflowDTO);
+ return backfillWorkflowDTO.getTriggerCode();
}
/**
@@ -395,74 +277,74 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
}
}
- /**
- * do action to process instance：pause, stop, repeat, recover from pause, recover from stop，rerun failed task
- *
- * @param loginUser login user
- * @param projectCode project code
- * @param processInstanceId process instance id
- * @param executeType execute type
- * @return execute result code
- */
@Override
- public Map<String, Object> execute(User loginUser,
- long projectCode,
- Integer processInstanceId,
- ExecuteType executeType) {
- checkNotNull(processInstanceId, "workflowInstanceId cannot be null");
+ public void controlWorkflowInstance(User loginUser, Integer workflowInstanceId, ExecuteType executeType) {
+ checkNotNull(workflowInstanceId, "workflowInstanceId cannot be null");
checkNotNull(executeType, "executeType cannot be null");
- // check user access for project
- projectService.checkProjectAndAuthThrowException(loginUser, projectCode,
- ApiFuncIdentificationConstant.map.get(executeType));
- checkMasterExists();
+ ProcessInstance workflowInstance = processInstanceDao
+ .queryOptionalById(workflowInstanceId)
+ .orElseThrow(() -> new ServiceException(Status.PROCESS_INSTANCE_NOT_EXIST, workflowInstanceId));
- ProcessInstance workflowInstance = processInstanceDao.queryOptionalById(processInstanceId)
- .orElseThrow(() -> new ServiceException(Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId));
-
- checkState(workflowInstance.getProjectCode() == projectCode,
- "The workflow instance's project code doesn't equals to the given project");
- ProcessDefinition processDefinition = processDefinitionService.queryWorkflowDefinitionThrowExceptionIfNotFound(
- workflowInstance.getProcessDefinitionCode(), workflowInstance.getProcessDefinitionVersion());
-
- executeClient.executeWorkflowInstance(new ExecuteContext(
- workflowInstance,
- processDefinition,
+ // check user access for project
+ projectService.checkProjectAndAuthThrowException(
loginUser,
- executeType));
-
- Map<String, Object> result = new HashMap<>();
- result.put(Constants.STATUS, Status.SUCCESS);
- return result;
- }
+ workflowInstance.getProjectCode(),
+ ApiFuncIdentificationConstant.map.get(executeType));
- /**
- * do action to workflow instance：pause, stop, repeat, recover from pause, recover from stop，rerun failed task
- *
- * @param loginUser login user
- * @param workflowInstanceId workflow instance id
- * @param executeType execute type
- * @return execute result code
- */
- @Override
- public Map<String, Object> execute(User loginUser, Integer workflowInstanceId, ExecuteType executeType) {
- ProcessInstance processInstance = processInstanceMapper.selectById(workflowInstanceId);
- return execute(loginUser, processInstance.getProjectCode(), workflowInstanceId, executeType);
+ switch (executeType) {
+ case REPEAT_RUNNING:
+ executorClient
+ .repeatRunningWorkflowInstance()
+ .onWorkflowInstance(workflowInstance)
+ .byUser(loginUser)
+ .execute();
+ return;
+ case START_FAILURE_TASK_PROCESS:
+ executorClient.recoverFailureTaskInstance()
+ .onWorkflowInstance(workflowInstance)
+ .byUser(loginUser)
+ .execute();
+ return;
+ case RECOVER_SUSPENDED_PROCESS:
+ executorClient.recoverSuspendedWorkflowInstanceOperation()
+ .onWorkflowInstance(workflowInstance)
+ .byUser(loginUser)
+ .execute();
+ return;
+ case PAUSE:
+ executorClient.pauseWorkflowInstance()
+ .onWorkflowInstance(workflowInstance)
+ .byUser(loginUser)
+ .execute();
+ return;
+ case STOP:
+ executorClient.stopWorkflowInstance()
+ .onWorkflowInstance(workflowInstance)
+ .byUser(loginUser)
+ .execute();
+ return;
+ default:
+ throw new ServiceException("Unsupported executeType: " + executeType);
+ }
}
/**
* do action to execute task in process instance
*
- * @param loginUser login user
- * @param projectCode project code
+ * @param loginUser login user
+ * @param projectCode project code
* @param processInstanceId process instance id
- * @param startNodeList start node list
- * @param taskDependType task depend type
+ * @param startNodeList start node list
+ * @param taskDependType task depend type
* @return execute result code
*/
@Override
- public WorkflowExecuteResponse executeTask(User loginUser, long projectCode, Integer processInstanceId,
- String startNodeList, TaskDependType taskDependType) {
+ public WorkflowExecuteResponse executeTask(User loginUser,
+ long projectCode,
+ Integer processInstanceId,
+ String startNodeList,
+ TaskDependType taskDependType) {
WorkflowExecuteResponse response = new WorkflowExecuteResponse();
@@ -555,10 +437,9 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
Map<String, Object> result = new HashMap<>();
TaskGroupQueue taskGroupQueue = taskGroupQueueMapper.selectById(queueId);
// check process instance exist
- ProcessInstance processInstance = processInstanceDao.queryOptionalById(taskGroupQueue.getProcessId())
+ processInstanceDao.queryOptionalById(taskGroupQueue.getProcessId())
.orElseThrow(
() -> new ServiceException(Status.PROCESS_INSTANCE_NOT_EXIST, taskGroupQueue.getProcessId()));
- checkMasterExists();
if (taskGroupQueue.getInQueue() == Flag.NO.getCode()) {
throw new ServiceException(Status.TASK_GROUP_QUEUE_ALREADY_START);
@@ -571,249 +452,6 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
return result;
}
- public void checkStartNodeList(String startNodeList, Long processDefinitionCode, int version) {
- if (StringUtils.isNotEmpty(startNodeList)) {
- List<ProcessTaskRelation> processTaskRelations =
- processService.findRelationByCode(processDefinitionCode, version);
- List<Long> existsNodes = processTaskRelations.stream().map(ProcessTaskRelation::getPostTaskCode)
- .collect(Collectors.toList());
- for (String startNode : startNodeList.split(Constants.COMMA)) {
- if (!existsNodes.contains(Long.valueOf(startNode))) {
- throw new ServiceException(Status.START_NODE_NOT_EXIST_IN_LAST_PROCESS, startNode);
- }
- }
- }
- }
- /**
- * Check the state of process instance and the type of operation match
- *
- * @param processInstance process instance
- * @param executeType execute type
- * @return check result code
- */
- private Map<String, Object> checkExecuteType(ProcessInstance processInstance, ExecuteType executeType) {
-
- Map<String, Object> result = new HashMap<>();
- WorkflowExecutionStatus executionStatus = processInstance.getState();
- boolean checkResult = false;
- switch (executeType) {
- case PAUSE:
- if (executionStatus.isRunning()) {
- checkResult = true;
- }
- break;
- case STOP:
- if (executionStatus.canStop()) {
- checkResult = true;
- }
- break;
- case REPEAT_RUNNING:
- if (executionStatus.isFinished()) {
- checkResult = true;
- }
- break;
- case START_FAILURE_TASK_PROCESS:
- if (executionStatus.isFailure()) {
- checkResult = true;
- }
- break;
- case RECOVER_SUSPENDED_PROCESS:
- if (executionStatus.isPause() || executionStatus.isStop()) {
- checkResult = true;
- }
- break;
- default:
- break;
- }
- if (!checkResult) {
- putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(),
- executionStatus.toString(), executeType.toString());
- } else {
- putMsg(result, Status.SUCCESS);
- }
- return result;
- }
-
- /**
- * prepare to update process instance command type and status
- *
- * @param processInstance process instance
- * @param commandType command type
- * @param executionStatus execute status
- * @return update result
- */
- private Map<String, Object> updateProcessInstancePrepare(ProcessInstance processInstance, CommandType commandType,
- WorkflowExecutionStatus executionStatus) {
- Map<String, Object> result = new HashMap<>();
-
- processInstance.setCommandType(commandType);
- processInstance.addHistoryCmd(commandType);
- processInstance.setStateWithDesc(executionStatus, commandType.getDescp() + "by ui");
- boolean update = processInstanceDao.updateById(processInstance);
-
- // determine whether the process is normal
- if (update) {
- log.info("Process instance state is updated to {} in database, processInstanceName:{}.",
- executionStatus.getDesc(), processInstance.getName());
- // directly send the process instance state change event to target master, not guarantee the event send
- // success
- WorkflowInstanceStateChangeEvent workflowStateEventChangeRequest = new WorkflowInstanceStateChangeEvent(
- processInstance.getId(), 0, processInstance.getState(), processInstance.getId(), 0);
- ITaskInstanceExecutionEventListener iTaskInstanceExecutionEventListener =
- SingletonJdkDynamicRpcClientProxyFactory
- .getProxyClient(processInstance.getHost(), ITaskInstanceExecutionEventListener.class);
- iTaskInstanceExecutionEventListener.onWorkflowInstanceInstanceStateChange(workflowStateEventChangeRequest);
- putMsg(result, Status.SUCCESS);
- } else {
- log.error("Process instance state update error, processInstanceName:{}.", processInstance.getName());
- putMsg(result, Status.EXECUTE_PROCESS_INSTANCE_ERROR);
- }
- return result;
- }
-
- /**
- * check whether sub processes are offline before starting process definition
- *
- * @param processDefinitionCode process definition code
- * @return check result code
- */
- @Override
- public Map<String, Object> startCheckByProcessDefinedCode(long processDefinitionCode) {
- Map<String, Object> result = new HashMap<>();
-
- ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(processDefinitionCode);
-
- if (processDefinition == null) {
- log.error("Process definition is not be found, processDefinitionCode:{}.", processDefinitionCode);
- putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "processDefinitionCode");
- return result;
- }
-
- List<Long> codes = processService.findAllSubWorkflowDefinitionCode(processDefinition.getCode());
- if (!codes.isEmpty()) {
- List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryByCodes(codes);
- if (processDefinitionList != null) {
- for (ProcessDefinition processDefinitionTmp : processDefinitionList) {
- /**
- * if there is no online process, exit directly
- */
- if (processDefinitionTmp.getReleaseState() != ReleaseState.ONLINE) {
- log.warn("Subprocess definition {} of process definition {} is not {}.",
- processDefinitionTmp.getName(),
- processDefinition.getName(), ReleaseState.ONLINE.getDescp());
- putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE, processDefinitionTmp.getName());
- return result;
- }
- }
- }
- }
- putMsg(result, Status.SUCCESS);
- return result;
- }
-
- /**
- * create command
- *
- * @param commandType commandType
- * @param processDefineCode processDefineCode
- * @param nodeDep nodeDep
- * @param failureStrategy failureStrategy
- * @param startNodeList startNodeList
- * @param schedule schedule
- * @param warningType warningType
- * @param executorId executorId
- * @param warningGroupId warningGroupId
- * @param runMode runMode
- * @param processInstancePriority processInstancePriority
- * @param workerGroup workerGroup
- * @param testFlag testFlag
- * @param environmentCode environmentCode
- * @param allLevelDependent allLevelDependent
- * @param executionOrder executionOrder
- * @return command id
- */
- private int createCommand(Long triggerCode, CommandType commandType, long processDefineCode, TaskDependType nodeDep,
- FailureStrategy failureStrategy, String startNodeList, String schedule,
- WarningType warningType, int executorId, Integer warningGroupId, RunMode runMode,
- Priority processInstancePriority, String workerGroup, String tenantCode,
- Long environmentCode,
- List<Property> startParamList, Integer expectedParallelismNumber, int dryRun,
- int testFlag, ComplementDependentMode complementDependentMode,
- boolean allLevelDependent, ExecutionOrder executionOrder) {
-
- /**
- * instantiate command schedule instance
- */
- Command command = new Command();
-
- Map<String, String> cmdParam = new HashMap<>();
- if (commandType == null) {
- command.setCommandType(CommandType.START_PROCESS);
- } else {
- command.setCommandType(commandType);
- }
- command.setProcessDefinitionCode(processDefineCode);
- if (nodeDep != null) {
- command.setTaskDependType(nodeDep);
- }
- if (failureStrategy != null) {
- command.setFailureStrategy(failureStrategy);
- }
-
- if (!StringUtils.isEmpty(startNodeList)) {
- cmdParam.put(CMD_PARAM_START_NODES, startNodeList);
- }
- if (warningType != null) {
- command.setWarningType(warningType);
- }
- if (CollectionUtils.isNotEmpty(startParamList)) {
- cmdParam.put(CMD_PARAM_START_PARAMS, JSONUtils.toJsonString(startParamList));
- }
- command.setCommandParam(JSONUtils.toJsonString(cmdParam));
- command.setExecutorId(executorId);
- command.setWarningGroupId(warningGroupId);
- command.setProcessInstancePriority(processInstancePriority);
- command.setWorkerGroup(workerGroup);
- command.setTenantCode(tenantCode);
- command.setEnvironmentCode(environmentCode);
- command.setDryRun(dryRun);
- command.setTestFlag(testFlag);
- ProcessDefinition processDefinition = processService.findProcessDefinitionByCode(processDefineCode);
- if (processDefinition != null) {
- command.setProcessDefinitionVersion(processDefinition.getVersion());
- }
- command.setProcessInstanceId(0);
-
- // determine whether to complement
- if (commandType == CommandType.COMPLEMENT_DATA) {
- if (schedule == null || StringUtils.isEmpty(schedule)) {
- log.error("Create {} type command error because parameter schedule is invalid.",
- command.getCommandType().getDescp());
- return 0;
- }
- if (!isValidateScheduleTime(schedule)) {
- return 0;
- }
- try {
- log.info("Start to create {} command, processDefinitionCode:{}.",
- command.getCommandType().getDescp(), processDefineCode);
- return createComplementCommandList(triggerCode, schedule, runMode, command, expectedParallelismNumber,
- complementDependentMode, allLevelDependent, executionOrder);
- } catch (CronParseException cronParseException) {
- // We catch the exception here just to make compiler happy, since we have already validated the schedule
- // cron expression before
- return 0;
- }
- } else {
- command.setCommandParam(JSONUtils.toJsonString(cmdParam));
- int count = commandService.createCommand(command);
- if (count > 0) {
- triggerRelationService.saveTriggerToDb(ApiTriggerType.COMMAND, triggerCode, command.getId());
- }
- return count;
- }
- }
-
private int createComplementCommand(Long triggerCode, Command command, Map<String, String> cmdParam,
List<ZonedDateTime> dateTimeList, List<Schedule> schedules,
ComplementDependentMode complementDependentMode, boolean allLevelDependent) {
@@ -847,21 +485,9 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
createComplementDependentCommand(schedules, command, allLevelDependent);
}
- if (createCount > 0) {
- triggerRelationService.saveTriggerToDb(ApiTriggerType.COMMAND, triggerCode, command.getId());
- }
return createCount;
}
- /**
- * create complement command
- * close left and close right
- *
- * @param scheduleTimeParam
- * @param runMode
- * @param executionOrder
- * @return
- */
protected int createComplementCommandList(Long triggerCode, String scheduleTimeParam, RunMode runMode,
Command command,
Integer expectedParallelismNumber,
@@ -1106,75 +732,17 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
return true;
}
- /**
- * @param scheduleTimeList
- * @return remove duplicate date list
- */
- private String removeDuplicates(String scheduleTimeList) {
- if (StringUtils.isNotEmpty(scheduleTimeList)) {
- return Arrays.stream(scheduleTimeList.split(COMMA)).map(String::trim).distinct()
- .collect(Collectors.joining(COMMA));
- }
- return null;
- }
-
- /**
- * query executing data of processInstance by master
- * @param processInstanceId
- * @return
- */
- @Override
- public WorkflowExecuteDto queryExecutingWorkflowByProcessInstanceId(Integer processInstanceId) {
- ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId).orElse(null);
- if (processInstance == null) {
- log.error("Process instance does not exist, processInstanceId:{}.", processInstanceId);
- return null;
- }
- IWorkflowInstanceService iWorkflowInstanceService = SingletonJdkDynamicRpcClientProxyFactory
- .getProxyClient(processInstance.getHost(), IWorkflowInstanceService.class);
- return iWorkflowInstanceService.getWorkflowExecutingData(processInstanceId);
- }
-
@Override
- public void execStreamTaskInstance(User loginUser, long projectCode, long taskDefinitionCode,
+ public void execStreamTaskInstance(User loginUser,
+ long projectCode,
+ long taskDefinitionCode,
int taskDefinitionVersion,
- int warningGroupId, String workerGroup, String tenantCode,
+ int warningGroupId,
+ String workerGroup,
+ String tenantCode,
Long environmentCode,
- Map<String, String> startParams, int dryRun) {
- Project project = projectMapper.queryByCode(projectCode);
- // check user access for project
- projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START);
-
- checkValidTenant(tenantCode);
- checkMasterExists();
- // todo dispatch improvement
- List<Server> masterServerList = monitorService.listServer(RegistryNodeType.MASTER);
- Server server = masterServerList.get(0);
-
- StreamingTaskTriggerRequest taskExecuteStartMessage = new StreamingTaskTriggerRequest();
- taskExecuteStartMessage.setExecutorId(loginUser.getId());
- taskExecuteStartMessage.setExecutorName(loginUser.getUserName());
- taskExecuteStartMessage.setProjectCode(projectCode);
- taskExecuteStartMessage.setTaskDefinitionCode(taskDefinitionCode);
- taskExecuteStartMessage.setTaskDefinitionVersion(taskDefinitionVersion);
- taskExecuteStartMessage.setWorkerGroup(workerGroup);
- taskExecuteStartMessage.setTenantCode(tenantCode);
- taskExecuteStartMessage.setWarningGroupId(warningGroupId);
- taskExecuteStartMessage.setEnvironmentCode(environmentCode);
- taskExecuteStartMessage.setStartParams(startParams);
- taskExecuteStartMessage.setDryRun(dryRun);
-
- IStreamingTaskOperator streamingTaskOperator = SingletonJdkDynamicRpcClientProxyFactory
- .getProxyClient(server.getHost() + ":" + server.getPort(), IStreamingTaskOperator.class);
- StreamingTaskTriggerResponse streamingTaskTriggerResponse =
- streamingTaskOperator.triggerStreamingTask(taskExecuteStartMessage);
- if (streamingTaskTriggerResponse.isSuccess()) {
- log.info("Send task execute start command complete, response is {}.", streamingTaskOperator);
- return;
- }
- log.error(
- "Start to execute stream task instance error, projectCode:{}, taskDefinitionCode:{}, taskVersion:{}, response: {}.",
- projectCode, taskDefinitionCode, taskDefinitionVersion, streamingTaskTriggerResponse);
- throw new ServiceException(Status.START_TASK_INSTANCE_ERROR);
+ Map<String, String> startParams,
+ int dryRun) {
+ throw new ServiceException("Not supported");
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/WorkflowUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/WorkflowUtils.java
new file mode 100644
index 0000000000..37264224f5
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/WorkflowUtils.java
@@ -0,0 +1,63 @@
+/*
+ * 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.api.utils;
+
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowBackFillRequest;
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class WorkflowUtils {
+
+ public static List<Long> parseStartNodeList(String startNodes) {
+ try {
+ if (StringUtils.isEmpty(startNodes)) {
+ return new ArrayList<>();
+ }
+ return Arrays.stream(startNodes.split(","))
+ .map(String::trim)
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ } catch (Exception ex) {
+ throw new ServiceException("Parse startNodes: " + startNodes + " error", ex);
+ }
+ }
+
+ public static WorkflowBackFillRequest.BackfillTime parseBackfillTime(String backfillTimeJson) {
+ try {
+ if (StringUtils.isEmpty(backfillTimeJson)) {
+ throw new IllegalArgumentException("backfillTime is empty");
+ }
+ WorkflowBackFillRequest.BackfillTime backfillTime =
+ JSONUtils.parseObject(backfillTimeJson, WorkflowBackFillRequest.BackfillTime.class);
+ if (backfillTime == null) {
+ throw new IllegalArgumentException("backfillTime is invalid");
+ }
+ return backfillTime;
+ } catch (Exception ex) {
+ throw new ServiceException("Parse backfillTime: " + backfillTimeJson + " error", ex);
+ }
+ }
+
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTO.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTO.java
new file mode 100644
index 0000000000..354c4ada29
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTO.java
@@ -0,0 +1,101 @@
+/*
+ * 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.api.validator.workflow;
+
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
+import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
+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.RunMode;
+import org.apache.dolphinscheduler.common.enums.TaskDependType;
+import org.apache.dolphinscheduler.common.enums.WarningType;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BackfillWorkflowDTO {
+
+ private User loginUser;
+
+ private ProcessDefinition workflowDefinition;
+
+ private List<Long> startNodes;
+
+ private FailureStrategy failureStrategy;
+
+ private TaskDependType taskDependType;
+
+ private CommandType execType;
+
+ private WarningType warningType;
+
+ private Integer warningGroupId;
+
+ private RunMode runMode;
+
+ private Priority workflowInstancePriority;
+
+ private String workerGroup;
+
+ private String tenantCode;
+
+ private Long environmentCode;
+
+ private List<Property> startParamList;
+
+ private Flag dryRun;
+
+ private Flag testFlag;
+
+ private Long triggerCode;
+
+ private BackfillParamsDTO backfillParams;
+
+ @Data
+ @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class BackfillParamsDTO {
+
+ private RunMode runMode;
+
+ private List<ZonedDateTime> backfillDateList;
+
+ private Integer expectedParallelismNumber;
+
+ private ComplementDependentMode backfillDependentMode;
+
+ private boolean allLevelDependent;
+ private ExecutionOrder executionOrder;
+ }
+
+}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventQueue.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTOValidator.java
similarity index 50%
rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventQueue.java
rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTOValidator.java
index 18e47ba86e..efc3aed35d 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEventQueue.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTOValidator.java
@@ -15,36 +15,31 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.event;
+package org.apache.dolphinscheduler.api.validator.workflow;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.dolphinscheduler.api.validator.IValidator;
+
+import org.apache.commons.collections4.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-@Component
@Slf4j
-public class WorkflowEventQueue {
-
- private static final LinkedBlockingQueue<WorkflowEvent> workflowEventQueue = new LinkedBlockingQueue<>();
-
- /**
- * Add a workflow event.
- */
- public void addEvent(WorkflowEvent workflowEvent) {
- workflowEventQueue.add(workflowEvent);
- log.info("Added workflow event to workflowEvent queue, event: {}", workflowEvent);
- }
-
- /**
- * Pool the head of the workflow event queue and wait an workflow event.
- */
- public WorkflowEvent poolEvent() throws InterruptedException {
- return workflowEventQueue.take();
- }
-
- public void clearWorkflowEventQueue() {
- workflowEventQueue.clear();
+@Component
+public class BackfillWorkflowDTOValidator implements IValidator<BackfillWorkflowDTO> {
+
+ @Override
+ public void validate(final BackfillWorkflowDTO backfillWorkflowDTO) {
+ final BackfillWorkflowDTO.BackfillParamsDTO backfillParams = backfillWorkflowDTO.getBackfillParams();
+ if (backfillParams == null) {
+ throw new IllegalArgumentException("backfillParams is null");
+ }
+ if (CollectionUtils.isEmpty(backfillParams.getBackfillDateList())) {
+ throw new IllegalArgumentException("backfillDateList is empty");
+ }
+ if (backfillParams.getExpectedParallelismNumber() < 0) {
+ throw new IllegalArgumentException("expectedParallelismNumber should >= 0");
+ }
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowRequestTransformer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowRequestTransformer.java
new file mode 100644
index 0000000000..6be429a396
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowRequestTransformer.java
@@ -0,0 +1,127 @@
+/*
+ * 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.api.validator.workflow;
+
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowBackFillRequest;
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.api.utils.WorkflowUtils;
+import org.apache.dolphinscheduler.api.validator.ITransformer;
+import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
+import org.apache.dolphinscheduler.common.utils.DateUtils;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.entity.Schedule;
+import org.apache.dolphinscheduler.dao.repository.ProcessDefinitionDao;
+import org.apache.dolphinscheduler.dao.repository.ProjectDao;
+import org.apache.dolphinscheduler.plugin.task.api.utils.PropertyUtils;
+import org.apache.dolphinscheduler.service.cron.CronUtils;
+import org.apache.dolphinscheduler.service.process.ProcessService;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.SneakyThrows;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BackfillWorkflowRequestTransformer implements ITransformer<WorkflowBackFillRequest, BackfillWorkflowDTO> {
+
+ @Autowired
+ private ProcessService processService;
+
+ @Autowired
+ private ProjectDao projectDao;
+
+ @Autowired
+ private ProcessDefinitionDao processDefinitionDao;
+
+ @Override
+ public BackfillWorkflowDTO transform(WorkflowBackFillRequest workflowBackFillRequest) {
+
+ final BackfillWorkflowDTO.BackfillParamsDTO backfillParams =
+ transformBackfillParamsDTO(workflowBackFillRequest);
+ final BackfillWorkflowDTO backfillWorkflowDTO = BackfillWorkflowDTO.builder()
+ .loginUser(workflowBackFillRequest.getLoginUser())
+ .startNodes(WorkflowUtils.parseStartNodeList(workflowBackFillRequest.getStartNodes()))
+ .failureStrategy(workflowBackFillRequest.getFailureStrategy())
+ .taskDependType(workflowBackFillRequest.getTaskDependType())
+ .execType(workflowBackFillRequest.getExecType())
+ .warningType(workflowBackFillRequest.getWarningType())
+ .warningGroupId(workflowBackFillRequest.getWarningGroupId())
+ .runMode(workflowBackFillRequest.getBackfillRunMode())
+ .workflowInstancePriority(workflowBackFillRequest.getWorkflowInstancePriority())
+ .workerGroup(workflowBackFillRequest.getWorkerGroup())
+ .tenantCode(workflowBackFillRequest.getTenantCode())
+ .environmentCode(workflowBackFillRequest.getEnvironmentCode())
+ .startParamList(
+ PropertyUtils.startParamsTransformPropertyList(workflowBackFillRequest.getStartParamList()))
+ .dryRun(workflowBackFillRequest.getDryRun())
+ .testFlag(workflowBackFillRequest.getTestFlag())
+ .triggerCode(CodeGenerateUtils.genCode())
+ .backfillParams(backfillParams)
+ .build();
+
+ ProcessDefinition workflowDefinition = processDefinitionDao
+ .queryByCode(workflowBackFillRequest.getWorkflowDefinitionCode())
+ .orElseThrow(() -> new ServiceException(
+ "Cannot find the workflow: " + workflowBackFillRequest.getWorkflowDefinitionCode()));
+
+ backfillWorkflowDTO.setWorkflowDefinition(workflowDefinition);
+ return backfillWorkflowDTO;
+ }
+
+ private BackfillWorkflowDTO.BackfillParamsDTO transformBackfillParamsDTO(WorkflowBackFillRequest workflowBackFillRequest) {
+ final List<ZonedDateTime> backfillDateList = parseBackfillDateList(workflowBackFillRequest);
+ return BackfillWorkflowDTO.BackfillParamsDTO.builder()
+ .runMode(workflowBackFillRequest.getBackfillRunMode())
+ .expectedParallelismNumber(workflowBackFillRequest.getExpectedParallelismNumber())
+ .backfillDateList(backfillDateList)
+ .backfillDependentMode(workflowBackFillRequest.getBackfillDependentMode())
+ .allLevelDependent(workflowBackFillRequest.isAllLevelDependent())
+ .executionOrder(workflowBackFillRequest.getExecutionOrder())
+ .build();
+ }
+
+ @SneakyThrows
+ private List<ZonedDateTime> parseBackfillDateList(WorkflowBackFillRequest workflowBackFillRequest) {
+ final WorkflowBackFillRequest.BackfillTime backfillTime = workflowBackFillRequest.getBackfillTime();
+ List<Schedule> schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode(
+ workflowBackFillRequest.getWorkflowDefinitionCode());
+
+ if (StringUtils.isNotEmpty(backfillTime.getComplementStartDate())
+ && StringUtils.isNotEmpty(backfillTime.getComplementEndDate())) {
+ // todo: why we need to filter the schedules here?
+ return CronUtils.getSelfFireDateList(
+ DateUtils.stringToZoneDateTime(backfillTime.getComplementStartDate()),
+ DateUtils.stringToZoneDateTime(backfillTime.getComplementEndDate()),
+ schedules);
+ }
+ if (StringUtils.isNotEmpty(backfillTime.getComplementScheduleDateList())) {
+ return Arrays.stream(backfillTime.getComplementScheduleDateList().split(","))
+ .distinct()
+ .map(DateUtils::stringToZoneDateTime)
+ .collect(Collectors.toList());
+ }
+ throw new ServiceException("backfillTime: " + backfillTime + " is invalid");
+ }
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTO.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTO.java
new file mode 100644
index 0000000000..4045c51a29
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTO.java
@@ -0,0 +1,78 @@
+/*
+ * 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.api.validator.workflow;
+
+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.RunMode;
+import org.apache.dolphinscheduler.common.enums.TaskDependType;
+import org.apache.dolphinscheduler.common.enums.WarningType;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TriggerWorkflowDTO {
+
+ private User loginUser;
+
+ private ProcessDefinition workflowDefinition;
+
+ private List<Long> startNodes;
+
+ private FailureStrategy failureStrategy;
+
+ private TaskDependType taskDependType;
+
+ private CommandType execType;
+
+ private WarningType warningType;
+
+ private Integer warningGroupId;
+
+ private RunMode runMode;
+
+ private Priority workflowInstancePriority;
+
+ private String workerGroup;
+
+ private String tenantCode;
+
+ private Long environmentCode;
+
+ private List<Property> startParamList;
+
+ private Flag dryRun;
+
+ private Flag testFlag;
+
+ private Long triggerCode;
+
+}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnablePauseOperator.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTOValidator.java
similarity index 54%
rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnablePauseOperator.java
rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTOValidator.java
index 8163817afc..bb889656a4 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/operator/BaseTaskExecuteRunnablePauseOperator.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowDTOValidator.java
@@ -15,24 +15,26 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.runner.operator;
+package org.apache.dolphinscheduler.api.validator.workflow;
-import org.apache.dolphinscheduler.dao.entity.TaskInstance;
-import org.apache.dolphinscheduler.server.master.runner.DefaultTaskExecuteRunnable;
+import org.apache.dolphinscheduler.api.validator.IValidator;
+import org.apache.dolphinscheduler.common.enums.CommandType;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
@Slf4j
-public abstract class BaseTaskExecuteRunnablePauseOperator implements TaskExecuteRunnableOperator {
+@Component
+public class TriggerWorkflowDTOValidator implements IValidator<TriggerWorkflowDTO> {
@Override
- public void operate(DefaultTaskExecuteRunnable taskExecuteRunnable) {
- try {
- pauseRemoteTaskInstanceInThreadPool(taskExecuteRunnable.getTaskInstance());
- } catch (Exception e) {
- log.error("Pause DefaultTaskExecuteRunnable failed", e);
+ public void validate(final TriggerWorkflowDTO triggerWorkflowDTO) {
+ if (triggerWorkflowDTO.getExecType() != CommandType.START_PROCESS) {
+ throw new IllegalArgumentException("The execType should be START_PROCESS");
+ }
+ if (triggerWorkflowDTO.getWorkflowDefinition() == null) {
+ throw new IllegalArgumentException("The workflowDefinition should not be null");
}
}
-
- protected abstract void pauseRemoteTaskInstanceInThreadPool(TaskInstance taskInstance);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowRequestTransformer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowRequestTransformer.java
new file mode 100644
index 0000000000..9bf0a32418
--- /dev/null
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/TriggerWorkflowRequestTransformer.java
@@ -0,0 +1,70 @@
+/*
+ * 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.api.validator.workflow;
+
+import org.apache.dolphinscheduler.api.dto.workflow.WorkflowTriggerRequest;
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.api.utils.WorkflowUtils;
+import org.apache.dolphinscheduler.api.validator.ITransformer;
+import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.repository.ProcessDefinitionDao;
+import org.apache.dolphinscheduler.plugin.task.api.utils.PropertyUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class TriggerWorkflowRequestTransformer implements ITransformer<WorkflowTriggerRequest, TriggerWorkflowDTO> {
+
+ @Autowired
+ private ProcessDefinitionDao processDefinitionDao;
+
+ @Override
+ public TriggerWorkflowDTO transform(WorkflowTriggerRequest workflowTriggerRequest) {
+ TriggerWorkflowDTO triggerWorkflowDTO = TriggerWorkflowDTO.builder()
+ .loginUser(workflowTriggerRequest.getLoginUser())
+ .startNodes(WorkflowUtils.parseStartNodeList(workflowTriggerRequest.getStartNodes()))
+ .failureStrategy(workflowTriggerRequest.getFailureStrategy())
+ .taskDependType(workflowTriggerRequest.getTaskDependType())
+ .execType(workflowTriggerRequest.getExecType())
+ .warningType(workflowTriggerRequest.getWarningType())
+ .warningGroupId(workflowTriggerRequest.getWarningGroupId())
+ .workflowInstancePriority(workflowTriggerRequest.getWorkflowInstancePriority())
+ .workerGroup(workflowTriggerRequest.getWorkerGroup())
+ .tenantCode(workflowTriggerRequest.getTenantCode())
+ .environmentCode(workflowTriggerRequest.getEnvironmentCode())
+ .startParamList(
+ PropertyUtils.startParamsTransformPropertyList(workflowTriggerRequest.getStartParamList()))
+ .dryRun(workflowTriggerRequest.getDryRun())
+ .testFlag(workflowTriggerRequest.getTestFlag())
+ .triggerCode(CodeGenerateUtils.genCode())
+ .build();
+
+ ProcessDefinition workflowDefinition = processDefinitionDao
+ .queryByCode(workflowTriggerRequest.getWorkflowDefinitionCode())
+ .orElseThrow(() -> new ServiceException(
+ "Cannot find the workflow: " + workflowTriggerRequest.getWorkflowDefinitionCode()));
+
+ triggerWorkflowDTO.setWorkflowDefinition(workflowDefinition);
+ return triggerWorkflowDTO;
+ }
+}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecuteFunctionControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkflowInstanceExecuteFunctionControllerTest.java
similarity index 75%
rename from dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecuteFunctionControllerTest.java
rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkflowInstanceExecuteFunctionControllerTest.java
index 5b77acc099..d7b7fca5f2 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecuteFunctionControllerTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkflowInstanceExecuteFunctionControllerTest.java
@@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.api.controller;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -43,11 +44,10 @@ import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MvcResult;
@@ -61,7 +61,7 @@ import com.google.gson.JsonObject;
/**
* executor controller test
*/
-public class ExecuteFunctionControllerTest extends AbstractControllerTest {
+public class WorkflowInstanceExecuteFunctionControllerTest extends AbstractControllerTest {
final Gson gson = new Gson();
final long projectCode = 1L;
@@ -89,7 +89,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
final Integer version = 1;
final boolean allLevelDependent = false;
final JsonObject expectResponseContent = gson
- .fromJson("{\"code\":0,\"msg\":\"success\",\"data\":\"Test Data\",\"success\":true,\"failed\":false}",
+ .fromJson("{\"code\":0,\"msg\":\"success\",\"data\":1,\"success\":true,\"failed\":false}",
JsonObject.class);
final ImmutableMap<String, Object> executeServiceResult =
@@ -107,7 +107,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("failureStrategy", String.valueOf(failureStrategy));
paramsMap.add("startNodeList", startNodeList);
paramsMap.add("taskDependType", String.valueOf(taskDependType));
- paramsMap.add("execType", String.valueOf(execType));
+ paramsMap.add("execType", CommandType.START_PROCESS.name());
paramsMap.add("warningType", String.valueOf(warningType));
paramsMap.add("warningGroupId", String.valueOf(warningGroupId));
paramsMap.add("runMode", String.valueOf(runMode));
@@ -123,15 +123,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("executionOrder", String.valueOf(executionOrder));
paramsMap.add("version", String.valueOf(version));
- when(executorService.execProcessInstance(any(User.class), eq(projectCode), eq(processDefinitionCode),
- eq(scheduleTime), eq(execType), eq(failureStrategy), eq(startNodeList), eq(taskDependType),
- eq(warningType),
- eq(warningGroupId), eq(runMode), eq(processInstancePriority), eq(workerGroup), eq(tenantCode),
- eq(environmentCode),
- eq(timeout), eq(startParams), eq(expectedParallelismNumber), eq(dryRun), eq(testFlag),
- eq(complementDependentMode), eq(version),
- eq(allLevelDependent), eq(executionOrder)))
- .thenReturn(executeServiceResult);
+ when(executorService.triggerWorkflowDefinition(Mockito.any())).thenReturn(1L);
// When
final MvcResult mvcResult = mockMvc
@@ -156,7 +148,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("failureStrategy", String.valueOf(failureStrategy));
paramsMap.add("startNodeList", startNodeList);
paramsMap.add("taskDependType", String.valueOf(taskDependType));
- paramsMap.add("execType", String.valueOf(execType));
+ paramsMap.add("execType", CommandType.START_PROCESS.name());
paramsMap.add("warningType", String.valueOf(warningType));
paramsMap.add("warningGroupId", String.valueOf(warningGroupId));
paramsMap.add("runMode", String.valueOf(runMode));
@@ -171,15 +163,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("executionOrder", String.valueOf(executionOrder));
paramsMap.add("version", String.valueOf(version));
- when(executorService.execProcessInstance(any(User.class), eq(projectCode), eq(processDefinitionCode),
- eq(scheduleTime), eq(execType), eq(failureStrategy), eq(startNodeList), eq(taskDependType),
- eq(warningType),
- eq(warningGroupId), eq(runMode), eq(processInstancePriority), eq(workerGroup), eq(tenantCode),
- eq(environmentCode),
- eq(Constants.MAX_TASK_TIMEOUT), eq(startParams), eq(expectedParallelismNumber), eq(dryRun),
- eq(testFlag),
- eq(complementDependentMode), eq(version), eq(allLevelDependent), eq(executionOrder)))
- .thenReturn(executeServiceResult);
+ when(executorService.triggerWorkflowDefinition(Mockito.any())).thenReturn(1L);
// When
final MvcResult mvcResult = mockMvc
@@ -204,7 +188,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("failureStrategy", String.valueOf(failureStrategy));
paramsMap.add("startNodeList", startNodeList);
paramsMap.add("taskDependType", String.valueOf(taskDependType));
- paramsMap.add("execType", String.valueOf(execType));
+ paramsMap.add("execType", CommandType.START_PROCESS.name());
paramsMap.add("warningType", String.valueOf(warningType));
paramsMap.add("warningGroupId", String.valueOf(warningGroupId));
paramsMap.add("runMode", String.valueOf(runMode));
@@ -219,14 +203,7 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("executionOrder", String.valueOf(executionOrder));
paramsMap.add("version", String.valueOf(version));
- when(executorService.execProcessInstance(any(User.class), eq(projectCode), eq(processDefinitionCode),
- eq(scheduleTime), eq(execType), eq(failureStrategy), eq(startNodeList), eq(taskDependType),
- eq(warningType),
- eq(warningGroupId), eq(runMode), eq(processInstancePriority), eq(workerGroup), eq(tenantCode),
- eq(environmentCode),
- eq(timeout), eq(null), eq(expectedParallelismNumber), eq(dryRun), eq(testFlag),
- eq(complementDependentMode), eq(version), eq(allLevelDependent), eq(executionOrder)))
- .thenReturn(executeServiceResult);
+ when(executorService.triggerWorkflowDefinition(Mockito.any())).thenReturn(1L);
// When
final MvcResult mvcResult = mockMvc
@@ -252,14 +229,8 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
paramsMap.add("scheduleTime", scheduleTime);
paramsMap.add("version", String.valueOf(version));
- when(executorService.execProcessInstance(any(User.class), eq(projectCode), eq(processDefinitionCode),
- eq(scheduleTime), eq(null), eq(failureStrategy), eq(null), eq(null), eq(warningType),
- eq(null), eq(null), eq(null), eq("default"), eq("default"), eq(-1L),
- eq(Constants.MAX_TASK_TIMEOUT), eq(null), eq(null), eq(0), eq(0),
- eq(complementDependentMode), eq(version), eq(allLevelDependent), eq(null)))
- .thenReturn(executeServiceResult);
+ when(executorService.triggerWorkflowDefinition(Mockito.any())).thenReturn(1L);
- // When
final MvcResult mvcResult = mockMvc
.perform(post("/projects/{projectCode}/executors/start-process-instance", projectCode)
.header("sessionId", sessionId)
@@ -267,7 +238,6 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
.andReturn();
- // Then
final JsonObject actualResponseContent =
gson.fromJson(mvcResult.getResponse().getContentAsString(), JsonObject.class);
assertThat(actualResponseContent).isEqualTo(expectResponseContent);
@@ -282,16 +252,13 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
final MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
paramsMap.add("processInstanceId", Integer.toString(processInstanceId));
paramsMap.add("executeType", String.valueOf(executeType));
- final Map<String, Object> executeServiceResult = new HashMap<>();
- executeServiceResult.put(Constants.STATUS, Status.SUCCESS);
- executeServiceResult.put(Constants.DATA_LIST, "Test Data");
final JsonObject expectResponseContent = gson
- .fromJson("{\"code\":0,\"msg\":\"success\",\"data\":\"Test Data\",\"success\":true,\"failed\":false}",
+ .fromJson("{\"code\":0,\"msg\":\"success\",\"data\":null,\"success\":true,\"failed\":false}",
JsonObject.class);
- when(executorService.execute(any(User.class), eq(projectCode), eq(processInstanceId), eq(ExecuteType.NONE)))
- .thenReturn(executeServiceResult);
+ doNothing().when(executorService).controlWorkflowInstance(any(User.class), eq(processInstanceId),
+ eq(ExecuteType.NONE));
// When
final MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/executors/execute", projectCode)
@@ -306,22 +273,4 @@ public class ExecuteFunctionControllerTest extends AbstractControllerTest {
assertThat(actualResponseContent).isEqualTo(expectResponseContent);
}
- @Test
- public void testStartCheckProcessDefinition() throws Exception {
- // Given
- when(executorService.startCheckByProcessDefinedCode(processDefinitionCode))
- .thenReturn(executeServiceResult);
- // When
- final MvcResult mvcResult = mockMvc.perform(post("/projects/{projectCode}/executors/start-check", projectCode)
- .header(SESSION_ID, sessionId)
- .param("processDefinitionCode", String.valueOf(processDefinitionCode)))
- .andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
- .andReturn();
- // Then
- final JsonObject actualResponseContent =
- gson.fromJson(mvcResult.getResponse().getContentAsString(), JsonObject.class);
- assertThat(actualResponseContent).isEqualTo(expectResponseContent);
- }
-
}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2ControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2ControllerTest.java
index 9b72a1c970..f2041be202 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2ControllerTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/v2/WorkflowInstanceV2ControllerTest.java
@@ -104,10 +104,7 @@ public class WorkflowInstanceV2ControllerTest extends AbstractControllerTest {
public void testExecuteWorkflowInstance() {
User loginUser = getLoginUser();
- Map<String, Object> result = new HashMap<>();
- putMsg(result, Status.SUCCESS);
-
- Mockito.when(execService.execute(any(), eq(1), any(ExecuteType.class))).thenReturn(result);
+ Mockito.doNothing().when(execService).controlWorkflowInstance(any(), eq(1), any(ExecuteType.class));
Result result1 = workflowInstanceV2Controller.execute(loginUser, 1, ExecuteType.STOP);
Assertions.assertTrue(result1.isSuccess());
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java
index 6751b8118f..35a74bebb7 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/enums/StatusTest.java
@@ -38,6 +38,8 @@ public class StatusTest {
LocaleContextHolder.setLocale(Locale.SIMPLIFIED_CHINESE);
Assertions.assertEquals("成功", Status.SUCCESS.getMsg());
+
+ LocaleContextHolder.setLocale(Locale.US);
}
@Test
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecuteFunctionTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecuteFunctionTest.java
new file mode 100644
index 0000000000..dc5f8b0939
--- /dev/null
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/executor/workflow/StopWorkflowInstanceExecuteFunctionTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.api.executor.workflow;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class StopWorkflowInstanceExecuteFunctionTest {
+
+ @Mock
+ private ProcessInstanceDao processInstanceDao;
+
+ @InjectMocks
+ private StopWorkflowInstanceExecutorDelegate stopWorkflowInstanceExecutorDelegate;
+
+ @ParameterizedTest
+ @EnumSource(value = WorkflowExecutionStatus.class, names = {
+ "RUNNING_EXECUTION",
+ "READY_PAUSE",
+ "READY_STOP",
+ "SERIAL_WAIT",
+ "WAIT_TO_RUN"})
+ void exceptionIfWorkflowInstanceCannotStop_canStop(WorkflowExecutionStatus workflowExecutionStatus) {
+ ProcessInstance workflowInstance = new ProcessInstance();
+ workflowInstance.setName("Workflow-1");
+ workflowInstance.setState(workflowExecutionStatus);
+ assertDoesNotThrow(
+ () -> stopWorkflowInstanceExecutorDelegate.exceptionIfWorkflowInstanceCannotStop(workflowInstance));
+ }
+
+ @ParameterizedTest
+ @EnumSource(value = WorkflowExecutionStatus.class, names = {
+ "RUNNING_EXECUTION",
+ "READY_PAUSE",
+ "READY_STOP",
+ "SERIAL_WAIT",
+ "WAIT_TO_RUN"}, mode = EnumSource.Mode.EXCLUDE)
+ void exceptionIfWorkflowInstanceCannotStop_canNotStop(WorkflowExecutionStatus workflowExecutionStatus) {
+ ProcessInstance workflowInstance = new ProcessInstance();
+ workflowInstance.setName("Workflow-1");
+ workflowInstance.setState(workflowExecutionStatus);
+ ServiceException serviceException = assertThrows(ServiceException.class,
+ () -> stopWorkflowInstanceExecutorDelegate.exceptionIfWorkflowInstanceCannotStop(workflowInstance));
+ Assertions.assertEquals(
+ "Internal Server Error: The workflow instance: Workflow-1 status is " + workflowExecutionStatus
+ + ", can not stop",
+ serviceException.getMessage());
+ }
+
+ @ParameterizedTest
+ @EnumSource(value = WorkflowExecutionStatus.class, names = {
+ "SERIAL_WAIT",
+ "WAIT_TO_RUN"})
+ void ifWorkflowInstanceCanDirectStopInDB_canDirectStopInDB(WorkflowExecutionStatus workflowExecutionStatus) {
+ ProcessInstance workflowInstance = new ProcessInstance();
+ workflowInstance.setName("Workflow-1");
+ workflowInstance.setState(workflowExecutionStatus);
+ Assertions
+ .assertTrue(stopWorkflowInstanceExecutorDelegate.ifWorkflowInstanceCanDirectStopInDB(workflowInstance));
+ }
+
+ @ParameterizedTest
+ @EnumSource(value = WorkflowExecutionStatus.class, names = {
+ "SERIAL_WAIT",
+ "WAIT_TO_RUN"}, mode = EnumSource.Mode.EXCLUDE)
+ void ifWorkflowInstanceCanDirectStopInDB_canNotDirectStopInDB(WorkflowExecutionStatus workflowExecutionStatus) {
+ ProcessInstance workflowInstance = new ProcessInstance();
+ workflowInstance.setName("Workflow-1");
+ workflowInstance.setState(workflowExecutionStatus);
+ Assertions.assertFalse(
+ stopWorkflowInstanceExecutorDelegate.ifWorkflowInstanceCanDirectStopInDB(workflowInstance));
+ }
+}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqWorkflowInstanceExecuteResultServiceTest.java
similarity index 97%
rename from dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqWorkflowInstanceExecuteResultServiceTest.java
index 4e43b5886c..3d3f16d2c0 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqExecuteResultServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DqWorkflowInstanceExecuteResultServiceTest.java
@@ -56,9 +56,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
@SpringBootTest(classes = ApiApplicationServer.class)
-public class DqExecuteResultServiceTest {
+public class DqWorkflowInstanceExecuteResultServiceTest {
- private static final Logger logger = LoggerFactory.getLogger(DqExecuteResultServiceTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(DqWorkflowInstanceExecuteResultServiceTest.class);
private static final Logger baseServiceLogger = LoggerFactory.getLogger(BaseServiceImpl.class);
@InjectMocks
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecuteFunctionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecuteFunctionServiceTest.java
deleted file mode 100644
index c722fb6014..0000000000
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecuteFunctionServiceTest.java
+++ /dev/null
@@ -1,703 +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.api.service;
-
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.RERUN;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_START;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.apache.dolphinscheduler.api.dto.workflowInstance.WorkflowExecuteResponse;
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
-import org.apache.dolphinscheduler.api.enums.Status;
-import org.apache.dolphinscheduler.api.exceptions.ServiceException;
-import org.apache.dolphinscheduler.api.executor.ExecuteClient;
-import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService;
-import org.apache.dolphinscheduler.api.service.impl.ExecutorServiceImpl;
-import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl;
-import org.apache.dolphinscheduler.common.constants.Constants;
-import org.apache.dolphinscheduler.common.enums.CommandType;
-import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
-import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
-import org.apache.dolphinscheduler.common.enums.FailureStrategy;
-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.WorkflowExecutionStatus;
-import org.apache.dolphinscheduler.common.model.Server;
-import org.apache.dolphinscheduler.dao.entity.Command;
-import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
-import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
-import org.apache.dolphinscheduler.dao.entity.Project;
-import org.apache.dolphinscheduler.dao.entity.Schedule;
-import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
-import org.apache.dolphinscheduler.dao.entity.Tenant;
-import org.apache.dolphinscheduler.dao.entity.User;
-import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
-import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
-import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
-import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
-import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
-import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
-import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
-import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
-import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
-import org.apache.dolphinscheduler.dao.utils.WorkerGroupUtils;
-import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
-import org.apache.dolphinscheduler.service.command.CommandService;
-import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.apache.dolphinscheduler.service.process.TriggerRelationService;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.assertj.core.util.Lists;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * executor service 2 test
- */
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
-public class ExecuteFunctionServiceTest {
-
- private static final Logger logger = LoggerFactory.getLogger(ExecuteFunctionServiceTest.class);
-
- @Mock
- private ResourcePermissionCheckService resourcePermissionCheckService;
-
- @InjectMocks
- private ExecutorServiceImpl executorService;
-
- @Mock
- private ProcessService processService;
-
- @Mock
- private CommandService commandService;
-
- @Mock
- private WorkerGroupService workerGroupService;
-
- @Mock
- private ProcessDefinitionMapper processDefinitionMapper;
-
- @Mock
- private ProcessTaskRelationMapper processTaskRelationMapper;
-
- @Mock
- private TaskDefinitionMapper taskDefinitionMapper;
-
- @Mock
- private TaskDefinitionLogMapper taskDefinitionLogMapper;
-
- @Mock
- private ProjectMapper projectMapper;
-
- @Mock
- private TenantMapper tenantMapper;
-
- @Mock
- private ProjectServiceImpl projectService;
-
- @Mock
- private MonitorService monitorService;
-
- @Mock
- private TaskGroupQueueMapper taskGroupQueueMapper;
-
- @Mock
- private ProcessInstanceMapper processInstanceMapper;
-
- @Mock
- private TriggerRelationService triggerRelationService;
-
- @Mock
- private ExecuteClient executeClient;
-
- @Mock
- private ProcessInstanceDao processInstanceDao;
-
- @Mock
- private ProcessDefinitionService processDefinitionService;
-
- @Mock
- private ProcessLineageService processLineageService;
-
- private int processDefinitionId = 1;
-
- private int processDefinitionVersion = 1;
-
- private long processDefinitionCode = 1L;
-
- private int processInstanceId = 1;
-
- private String tenantCode = "root";
-
- private int userId = 1;
-
- private int taskQueueId = 1;
-
- private ProcessDefinition processDefinition = new ProcessDefinition();
-
- private ProcessInstance processInstance = new ProcessInstance();
-
- private TaskGroupQueue taskGroupQueue = new TaskGroupQueue();
-
- private List<ProcessTaskRelation> processTaskRelations = new ArrayList<>();
-
- private User loginUser = new User();
-
- private long projectCode = 1L;
-
- private String projectName = "projectName";
-
- private Project project = new Project();
-
- private String cronTime;
-
- @BeforeEach
- public void init() {
- // user
- loginUser.setId(userId);
-
- // processDefinition
- processDefinition.setId(processDefinitionId);
- processDefinition.setReleaseState(ReleaseState.ONLINE);
- processDefinition.setUserId(userId);
- processDefinition.setVersion(1);
- processDefinition.setCode(1L);
- processDefinition.setProjectCode(projectCode);
-
- // processInstance
- processInstance.setId(processInstanceId);
- processInstance.setProjectCode(projectCode);
- processInstance.setState(WorkflowExecutionStatus.FAILURE);
- processInstance.setExecutorId(userId);
- processInstance.setHost("127.0.0.1:5678");
- processInstance.setProcessDefinitionVersion(1);
- processInstance.setProcessDefinitionCode(1L);
-
- // project
- project.setCode(projectCode);
- project.setName(projectName);
-
- // taskGroupQueue
- taskGroupQueue.setId(taskQueueId);
- taskGroupQueue.setStatus(TaskGroupQueueStatus.WAIT_QUEUE);
- taskGroupQueue.setProcessId(processInstanceId);
-
- // cronRangeTime
- cronTime = "2020-01-01 00:00:00,2020-01-31 23:00:00";
-
- // processTaskRelations
- ProcessTaskRelation processTaskRelation1 = new ProcessTaskRelation();
- processTaskRelation1.setPostTaskCode(123456789L);
- ProcessTaskRelation processTaskRelation2 = new ProcessTaskRelation();
- processTaskRelation2.setPostTaskCode(987654321L);
- processTaskRelations.add(processTaskRelation1);
- processTaskRelations.add(processTaskRelation2);
-
- // mock
- Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START))
- .thenReturn(checkProjectAndAuth());
- Mockito.when(processDefinitionMapper.queryByCode(processDefinitionCode)).thenReturn(this.processDefinition);
- Mockito.when(processService.getTenantForProcess(tenantCode, userId)).thenReturn(tenantCode);
- doReturn(1).when(commandService).createCommand(argThat(c -> c.getId() == null));
- doReturn(0).when(commandService).createCommand(argThat(c -> c.getId() != null));
- Mockito.when(monitorService.listServer(RegistryNodeType.MASTER)).thenReturn(getMasterServersList());
- Mockito.when(processService.findProcessInstanceDetailById(processInstanceId))
- .thenReturn(Optional.ofNullable(processInstance));
- Mockito.when(processService.findProcessDefinition(1L, 1)).thenReturn(this.processDefinition);
- Mockito.when(taskGroupQueueMapper.selectById(1)).thenReturn(taskGroupQueue);
- Mockito.when(processInstanceMapper.selectById(1)).thenReturn(processInstance);
- Mockito.when(triggerRelationService.saveProcessInstanceTrigger(Mockito.any(), Mockito.any()))
- .thenReturn(1);
- Mockito.when(processService.findRelationByCode(processDefinitionCode, processDefinitionVersion))
- .thenReturn(processTaskRelations);
- }
-
- /**
- * not complement
- */
- @Test
- public void testNoComplement() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.START_PROCESS,
- null, null,
- null, null, null,
- RunMode.RUN_MODE_SERIAL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 10, null, null,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- verify(commandService, times(1)).createCommand(any(Command.class));
-
- }
-
- /**
- * not complement
- */
- @Test
- public void testComplementWithStartNodeList() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.START_PROCESS,
- null, "123456789,987654321",
- null, null, null,
- RunMode.RUN_MODE_SERIAL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, null,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- verify(commandService, times(1)).createCommand(any(Command.class));
-
- }
-
- @Test
- public void testComplementWithOldStartNodeList() {
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = new HashMap<>();
- try {
- result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.START_PROCESS,
- null, "1123456789,987654321",
- null, null, null,
- RunMode.RUN_MODE_SERIAL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 0,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- } catch (ServiceException e) {
- Assertions.assertEquals(Status.START_NODE_NOT_EXIST_IN_LAST_PROCESS.getCode(), e.getCode());
- }
- }
-
- @Test
- public void testComplementWithDependentMode() {
- Schedule schedule = new Schedule();
- schedule.setStartTime(new Date());
- schedule.setEndTime(new Date());
- schedule.setCrontab("0 0 7 * * ? *");
- schedule.setFailureStrategy(FailureStrategy.CONTINUE);
- schedule.setReleaseState(ReleaseState.OFFLINE);
- schedule.setWarningType(WarningType.NONE);
- schedule.setCreateTime(new Date());
- schedule.setUpdateTime(new Date());
- List<Schedule> schedules = Lists.newArrayList(schedule);
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(
- processDefinitionCode))
- .thenReturn(schedules);
-
- DependentProcessDefinition dependentProcessDefinition = new DependentProcessDefinition();
- dependentProcessDefinition.setProcessDefinitionCode(2);
- dependentProcessDefinition.setProcessDefinitionVersion(1);
- dependentProcessDefinition.setTaskDefinitionCode(1);
- dependentProcessDefinition.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
- dependentProcessDefinition.setTaskParams(
- "{\"localParams\":[],\"resourceList\":[],\"dependence\":{\"relation\":\"AND\",\"dependTaskList\":[{\"relation\":\"AND\",\"dependItemList\":[{\"depTaskCode\":2,\"status\":\"SUCCESS\"}]}]},\"conditionResult\":{\"successNode\":[1],\"failedNode\":[1]}}");
- Mockito.when(processLineageService.queryDownstreamDependentProcessDefinitions(processDefinitionCode))
- .thenReturn(Lists.newArrayList(dependentProcessDefinition));
-
- Map<Long, String> processDefinitionWorkerGroupMap = new HashMap<>();
- processDefinitionWorkerGroupMap.put(1L, WorkerGroupUtils.getDefaultWorkerGroup());
- Mockito.when(workerGroupService.queryWorkerGroupByProcessDefinitionCodes(Lists.newArrayList(1L)))
- .thenReturn(processDefinitionWorkerGroupMap);
-
- Command command = new Command();
- command.setId(1);
- command.setCommandType(CommandType.COMPLEMENT_DATA);
- command.setCommandParam(
- "{\"StartNodeList\":\"1\",\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}");
- command.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
- command.setProcessDefinitionCode(processDefinitionCode);
- command.setExecutorId(1);
-
- // not enable allLevelDependent
- int count = executorService.createComplementDependentCommand(schedules, command, false);
- Assertions.assertEquals(1, count);
-
- // enable allLevelDependent
- DependentProcessDefinition childDependent = new DependentProcessDefinition();
- childDependent.setProcessDefinitionCode(3);
- childDependent.setProcessDefinitionVersion(1);
- childDependent.setTaskDefinitionCode(4);
- childDependent.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
- childDependent.setTaskParams(
- "{\"localParams\":[],\"resourceList\":[],\"dependence\":{\"relation\":\"AND\",\"dependTaskList\":[{\"relation\":\"AND\",\"dependItemList\":[{\"depTaskCode\":3,\"status\":\"SUCCESS\"}]}]},\"conditionResult\":{\"successNode\":[1],\"failedNode\":[1]}}");
- Mockito.when(processLineageService.queryDownstreamDependentProcessDefinitions(
- dependentProcessDefinition.getProcessDefinitionCode())).thenReturn(Lists.newArrayList(childDependent))
- .thenReturn(Lists.newArrayList());
- int allLevelDependentCount = executorService.createComplementDependentCommand(schedules, command, true);
- Assertions.assertEquals(2, allLevelDependentCount);
- }
-
- /**
- * date error
- */
- @Test
- public void testDateError() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2022-01-07 12:12:12\",\"complementEndDate\":\"2022-01-06 12:12:12\"}",
- CommandType.COMPLEMENT_DATA,
- null, null,
- null, null, null,
- RunMode.RUN_MODE_SERIAL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 2,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.START_PROCESS_INSTANCE_ERROR, result.get(Constants.STATUS));
- verify(commandService, times(0)).createCommand(any(Command.class));
- }
-
- /**
- * serial
- */
- @Test
- public void testSerial() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.COMPLEMENT_DATA,
- null, null,
- null, null, null,
- RunMode.RUN_MODE_SERIAL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, null,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- verify(commandService, times(1)).createCommand(any(Command.class));
- }
-
- /**
- * without schedule
- */
- @Test
- public void testParallelWithOutSchedule() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(zeroSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.COMPLEMENT_DATA,
- null, null,
- null, null, null,
- RunMode.RUN_MODE_PARALLEL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 2,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
-
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- verify(commandService, times(2)).createCommand(any(Command.class));
- }
-
- /**
- * with schedule
- */
- @Test
- public void testParallelWithSchedule() {
-
- Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
- .thenReturn(oneSchedulerList());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.COMPLEMENT_DATA,
- null, null,
- null, null, null,
- RunMode.RUN_MODE_PARALLEL,
- Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 15,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- verify(commandService, times(15)).createCommand(any(Command.class));
-
- }
-
- @Test
- public void testNoMasterServers() {
- Mockito.when(monitorService.listServer(RegistryNodeType.MASTER)).thenReturn(new ArrayList<>());
-
- Assertions.assertThrows(ServiceException.class, () -> executorService.execProcessInstance(
- loginUser,
- projectCode,
- processDefinitionCode,
- "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
- CommandType.COMPLEMENT_DATA,
- null,
- null,
- null,
- null,
- null,
- RunMode.RUN_MODE_PARALLEL,
- Priority.LOW,
- WorkerGroupUtils.getDefaultWorkerGroup(),
- tenantCode,
- 100L,
- 110,
- null,
- null,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_NO,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER));
- }
-
- @Test
- public void testExecuteRepeatRunning() {
- when(commandService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true);
- when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN))
- .thenReturn(checkProjectAndAuth());
- when(processInstanceDao.queryOptionalById(processInstanceId)).thenReturn(Optional.of(processInstance));
- when(processDefinitionService.queryWorkflowDefinitionThrowExceptionIfNotFound(processDefinitionCode,
- processDefinitionVersion)).thenReturn(processDefinition);
- Map<String, Object> result =
- executorService.execute(loginUser, projectCode, processInstanceId, ExecuteType.REPEAT_RUNNING);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- }
-
- @Test
- public void testOfTestRun() {
- Mockito.when(commandService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true);
- Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN))
- .thenReturn(checkProjectAndAuth());
- Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
- Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
- 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, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 15,
- Constants.DRY_RUN_FLAG_NO,
- Constants.TEST_FLAG_YES,
- ComplementDependentMode.OFF_MODE, null,
- false,
- ExecutionOrder.DESC_ORDER);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- }
-
- @Test
- public void testStartCheckByProcessDefinedCode() {
- List<Long> ids = Lists.newArrayList(1L);
- when(processService.findAllSubWorkflowDefinitionCode(1)).thenReturn(ids);
-
- List<ProcessDefinition> processDefinitionList = new ArrayList<>();
- ProcessDefinition processDefinition = new ProcessDefinition();
- processDefinition.setId(1);
- processDefinition.setReleaseState(ReleaseState.ONLINE);
- processDefinitionList.add(processDefinition);
- Mockito.when(processDefinitionMapper.queryDefinitionListByIdList(new Integer[ids.size()]))
- .thenReturn(processDefinitionList);
-
- Map<String, Object> result = executorService.startCheckByProcessDefinedCode(1L);
- Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
- }
-
- private List<Server> getMasterServersList() {
- List<Server> masterServerList = new ArrayList<>();
- Server masterServer1 = new Server();
- masterServer1.setId(1);
- masterServer1.setHost("192.168.220.188");
- masterServer1.setPort(1121);
- masterServerList.add(masterServer1);
-
- Server masterServer2 = new Server();
- masterServer2.setId(2);
- masterServer2.setHost("192.168.220.189");
- masterServer2.setPort(1122);
- masterServerList.add(masterServer2);
-
- return masterServerList;
- }
-
- private List zeroSchedulerList() {
- return Collections.EMPTY_LIST;
- }
-
- private List<Schedule> oneSchedulerList() {
- List<Schedule> schedulerList = new LinkedList<>();
- Schedule schedule = new Schedule();
- schedule.setCrontab("0 0 0 1/2 * ?");
- schedulerList.add(schedule);
- return schedulerList;
- }
-
- private Map<String, Object> checkProjectAndAuth() {
- Map<String, Object> result = new HashMap<>();
- result.put(Constants.STATUS, Status.SUCCESS);
- return result;
- }
-
- @Test
- public void testCreateComplementToParallel() {
- List<String> result = new ArrayList<>();
- int expectedParallelismNumber = 3;
- LinkedList<Integer> listDate = new LinkedList<>();
- listDate.add(0);
- listDate.add(1);
- listDate.add(2);
- listDate.add(3);
- listDate.add(4);
-
- int listDateSize = listDate.size();
- int createCount = Math.min(listDate.size(), expectedParallelismNumber);
- logger.info("In parallel mode, current expectedParallelismNumber:{}", createCount);
-
- int itemsPerCommand = (listDateSize / createCount);
- int remainingItems = (listDateSize % createCount);
- int startDateIndex = 0;
- int endDateIndex = 0;
-
- for (int i = 1; i <= createCount; i++) {
- int extra = (i <= remainingItems) ? 1 : 0;
- int singleCommandItems = (itemsPerCommand + extra);
-
- if (i == 1) {
- endDateIndex += singleCommandItems - 1;
- } else {
- startDateIndex = endDateIndex + 1;
- endDateIndex += singleCommandItems;
- }
-
- logger.info("startDate:{}, endDate:{}", listDate.get(startDateIndex), listDate.get(endDateIndex));
- result.add(listDate.get(startDateIndex) + "," + listDate.get(endDateIndex));
- }
-
- Assertions.assertEquals("0,1", result.get(0));
- Assertions.assertEquals("2,3", result.get(1));
- Assertions.assertEquals("4,4", result.get(2));
- }
-
- @Test
- public void testExecuteTask() {
- String startNodeList = "1234567870";
- TaskDependType taskDependType = TaskDependType.TASK_ONLY;
-
- ProcessInstance processInstanceMock = Mockito.mock(ProcessInstance.class, RETURNS_DEEP_STUBS);
- Mockito.when(processService.findProcessInstanceDetailById(processInstanceId))
- .thenReturn(Optional.ofNullable(processInstanceMock));
-
- ProcessDefinition processDefinition = new ProcessDefinition();
- processDefinition.setProjectCode(projectCode);
- Mockito.when(processService.findProcessDefinition(Mockito.anyLong(), Mockito.anyInt()))
- .thenReturn(processDefinition);
-
- Mockito.when(processService.getTenantForProcess(Mockito.anyString(), Mockito.anyInt())).thenReturn(tenantCode);
-
- when(processInstanceMock.getState().isFinished()).thenReturn(false);
- WorkflowExecuteResponse responseInstanceIsNotFinished =
- executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
- Assertions.assertEquals(Status.WORKFLOW_INSTANCE_IS_NOT_FINISHED.getCode(),
- responseInstanceIsNotFinished.getCode());
-
- when(processInstanceMock.getState().isFinished()).thenReturn(true);
- WorkflowExecuteResponse responseStartNodeListError =
- executorService.executeTask(loginUser, projectCode, processInstanceId, "1234567870,", taskDependType);
- Assertions.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), responseStartNodeListError.getCode());
-
- Mockito.when(taskDefinitionLogMapper.queryMaxVersionForDefinition(Mockito.anyLong())).thenReturn(null);
- WorkflowExecuteResponse responseNotDefineTask =
- executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
- Assertions.assertEquals(Status.EXECUTE_NOT_DEFINE_TASK.getCode(), responseNotDefineTask.getCode());
-
- Mockito.when(taskDefinitionLogMapper.queryMaxVersionForDefinition(Mockito.anyLong())).thenReturn(1);
- Mockito.when(commandService.verifyIsNeedCreateCommand(any())).thenReturn(true);
- WorkflowExecuteResponse responseSuccess =
- executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
- Assertions.assertEquals(Status.SUCCESS.getCode(), responseSuccess.getCode());
-
- }
-
-}
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 26bbc95412..75474e0287 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
@@ -204,7 +204,7 @@ public class ProcessInstanceServiceTest {
"2020-01-02 00:00:00",
"",
"test_user",
- WorkflowExecutionStatus.SUBMITTED_SUCCESS,
+ WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx",
"",
1,
@@ -237,7 +237,7 @@ public class ProcessInstanceServiceTest {
"20200102 00:00:00",
"",
loginUser.getUserName(),
- WorkflowExecutionStatus.SUBMITTED_SUCCESS,
+ WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx",
"",
1,
@@ -264,7 +264,7 @@ public class ProcessInstanceServiceTest {
Result successRes =
processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "2020-01-01 00:00:00",
- "2020-01-02 00:00:00", "", loginUser.getUserName(), WorkflowExecutionStatus.SUBMITTED_SUCCESS,
+ "2020-01-02 00:00:00", "", loginUser.getUserName(), WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx", "", 1, 10);
Assertions.assertEquals(Status.SUCCESS.getCode(), (int) successRes.getCode());
@@ -273,7 +273,7 @@ public class ProcessInstanceServiceTest {
eq(1L), eq(""), eq(""), Mockito.any(),
eq("192.168.xx.xx"), eq(null), eq(null))).thenReturn(pageReturn);
successRes = processInstanceService.queryProcessInstanceList(loginUser, projectCode, 1, "",
- "", "", loginUser.getUserName(), WorkflowExecutionStatus.SUBMITTED_SUCCESS,
+ "", "", loginUser.getUserName(), WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx", "", 1, 10);
Assertions.assertEquals(Status.SUCCESS.getCode(), (int) successRes.getCode());
@@ -282,7 +282,7 @@ public class ProcessInstanceServiceTest {
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", WorkflowExecutionStatus.SUBMITTED_SUCCESS,
+ "2020-01-02 00:00:00", "", "admin", WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx", "", 1, 10);
Assertions.assertEquals(Status.SUCCESS.getCode(), (int) executorExistRes.getCode());
@@ -293,7 +293,7 @@ public class ProcessInstanceServiceTest {
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,
+ "2020-01-02 00:00:00", "", "", WorkflowExecutionStatus.RUNNING_EXECUTION,
"192.168.xx.xx", "", 1, 10);
Assertions.assertEquals(Status.SUCCESS.getCode(), (int) executorEmptyRes.getCode());
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkflowInstanceExecuteFunctionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkflowInstanceExecuteFunctionServiceTest.java
new file mode 100644
index 0000000000..1270ef1fbd
--- /dev/null
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkflowInstanceExecuteFunctionServiceTest.java
@@ -0,0 +1,699 @@
+/*
+ * 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.api.service;
+
+//import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.RERUN;
+//import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_START;
+//import static org.mockito.ArgumentMatchers.any;
+//import static org.mockito.ArgumentMatchers.argThat;
+//import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+//import static org.mockito.Mockito.doReturn;
+//import static org.mockito.Mockito.times;
+//import static org.mockito.Mockito.verify;
+//import static org.mockito.Mockito.when;
+//
+//import org.apache.dolphinscheduler.api.dto.workflowInstance.WorkflowExecuteResponse;
+//import org.apache.dolphinscheduler.api.enums.ExecuteType;
+//import org.apache.dolphinscheduler.api.enums.Status;
+//import org.apache.dolphinscheduler.api.exceptions.ServiceException;
+//import org.apache.dolphinscheduler.api.executor.workflow.instance.WorkflowInstanceExecuteClient;
+//import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService;
+//import org.apache.dolphinscheduler.api.service.impl.ExecutorServiceImpl;
+//import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl;
+//import org.apache.dolphinscheduler.common.constants.Constants;
+//import org.apache.dolphinscheduler.common.enums.CommandType;
+//import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
+//import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
+//import org.apache.dolphinscheduler.common.enums.FailureStrategy;
+//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.WorkflowExecutionStatus;
+//import org.apache.dolphinscheduler.common.model.Server;
+//import org.apache.dolphinscheduler.dao.entity.Command;
+//import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition;
+//import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+//import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+//import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
+//import org.apache.dolphinscheduler.dao.entity.Project;
+//import org.apache.dolphinscheduler.dao.entity.Schedule;
+//import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
+//import org.apache.dolphinscheduler.dao.entity.Tenant;
+//import org.apache.dolphinscheduler.dao.entity.User;
+//import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
+//import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
+//import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
+//import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
+//import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
+//import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
+//import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
+//import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
+//import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
+//import org.apache.dolphinscheduler.dao.utils.WorkerGroupUtils;
+//import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
+//import org.apache.dolphinscheduler.service.command.CommandService;
+//import org.apache.dolphinscheduler.service.process.ProcessService;
+//import org.apache.dolphinscheduler.service.process.TriggerRelationService;
+//
+//import java.util.ArrayList;
+//import java.util.Collections;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.LinkedList;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Optional;
+//
+//import org.assertj.core.util.Lists;
+//import org.junit.jupiter.api.Assertions;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+/**
+ * executor service 2 test
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class WorkflowInstanceExecuteFunctionServiceTest {
+
+ // private static final Logger logger = LoggerFactory.getLogger(WorkflowInstanceExecuteFunctionServiceTest.class);
+ //
+ // @Mock
+ // private ResourcePermissionCheckService resourcePermissionCheckService;
+ //
+ // @InjectMocks
+ // private ExecutorServiceImpl executorService;
+ //
+ // @Mock
+ // private ProcessService processService;
+ //
+ // @Mock
+ // private CommandService commandService;
+ //
+ // @Mock
+ // private WorkerGroupService workerGroupService;
+ //
+ // @Mock
+ // private ProcessDefinitionMapper processDefinitionMapper;
+ //
+ // @Mock
+ // private ProcessTaskRelationMapper processTaskRelationMapper;
+ //
+ // @Mock
+ // private TaskDefinitionMapper taskDefinitionMapper;
+ //
+ // @Mock
+ // private TaskDefinitionLogMapper taskDefinitionLogMapper;
+ //
+ // @Mock
+ // private ProjectMapper projectMapper;
+ //
+ // @Mock
+ // private TenantMapper tenantMapper;
+ //
+ // @Mock
+ // private ProjectServiceImpl projectService;
+ //
+ // @Mock
+ // private MonitorService monitorService;
+ //
+ // @Mock
+ // private TaskGroupQueueMapper taskGroupQueueMapper;
+ //
+ // @Mock
+ // private ProcessInstanceMapper processInstanceMapper;
+ //
+ // @Mock
+ // private TriggerRelationService triggerRelationService;
+ //
+ // @Mock
+ // private WorkflowInstanceExecuteClient workflowInstanceExecuteClient;
+ //
+ // @Mock
+ // private ProcessInstanceDao processInstanceDao;
+ //
+ // @Mock
+ // private ProcessDefinitionService processDefinitionService;
+ //
+ // @Mock
+ // private ProcessLineageService processLineageService;
+ //
+ // private int processDefinitionId = 1;
+ //
+ // private int processDefinitionVersion = 1;
+ //
+ // private long processDefinitionCode = 1L;
+ //
+ // private int processInstanceId = 1;
+ //
+ // private String tenantCode = "root";
+ //
+ // private int userId = 1;
+ //
+ // private int taskQueueId = 1;
+ //
+ // private ProcessDefinition processDefinition = new ProcessDefinition();
+ //
+ // private ProcessInstance processInstance = new ProcessInstance();
+ //
+ // private TaskGroupQueue taskGroupQueue = new TaskGroupQueue();
+ //
+ // private List<ProcessTaskRelation> processTaskRelations = new ArrayList<>();
+ //
+ // private User loginUser = new User();
+ //
+ // private long projectCode = 1L;
+ //
+ // private String projectName = "projectName";
+ //
+ // private Project project = new Project();
+ //
+ // private String cronTime;
+ //
+ // @BeforeEach
+ // public void init() {
+ // // user
+ // loginUser.setId(userId);
+ //
+ // // processDefinition
+ // processDefinition.setId(processDefinitionId);
+ // processDefinition.setReleaseState(ReleaseState.ONLINE);
+ // processDefinition.setUserId(userId);
+ // processDefinition.setVersion(1);
+ // processDefinition.setCode(1L);
+ // processDefinition.setProjectCode(projectCode);
+ //
+ // // processInstance
+ // processInstance.setId(processInstanceId);
+ // processInstance.setProjectCode(projectCode);
+ // processInstance.setState(WorkflowExecutionStatus.FAILURE);
+ // processInstance.setExecutorId(userId);
+ // processInstance.setHost("127.0.0.1:5678");
+ // processInstance.setProcessDefinitionVersion(1);
+ // processInstance.setProcessDefinitionCode(1L);
+ //
+ // // project
+ // project.setCode(projectCode);
+ // project.setName(projectName);
+ //
+ // // taskGroupQueue
+ // taskGroupQueue.setId(taskQueueId);
+ // taskGroupQueue.setStatus(TaskGroupQueueStatus.WAIT_QUEUE);
+ // taskGroupQueue.setProcessId(processInstanceId);
+ //
+ // // cronRangeTime
+ // cronTime = "2020-01-01 00:00:00,2020-01-31 23:00:00";
+ //
+ // // processTaskRelations
+ // ProcessTaskRelation processTaskRelation1 = new ProcessTaskRelation();
+ // processTaskRelation1.setPostTaskCode(123456789L);
+ // ProcessTaskRelation processTaskRelation2 = new ProcessTaskRelation();
+ // processTaskRelation2.setPostTaskCode(987654321L);
+ // processTaskRelations.add(processTaskRelation1);
+ // processTaskRelations.add(processTaskRelation2);
+ //
+ // // mock
+ // Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project);
+ // Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_START))
+ // .thenReturn(checkProjectAndAuth());
+ // Mockito.when(processDefinitionMapper.queryByCode(processDefinitionCode)).thenReturn(this.processDefinition);
+ // Mockito.when(processService.getTenantForProcess(tenantCode, userId)).thenReturn(tenantCode);
+ // doReturn(1).when(commandService).createCommand(argThat(c -> c.getId() == null));
+ // doReturn(0).when(commandService).createCommand(argThat(c -> c.getId() != null));
+ // Mockito.when(monitorService.listServer(RegistryNodeType.MASTER)).thenReturn(getMasterServersList());
+ // Mockito.when(processService.findProcessInstanceDetailById(processInstanceId))
+ // .thenReturn(Optional.ofNullable(processInstance));
+ // Mockito.when(processService.findProcessDefinition(1L, 1)).thenReturn(this.processDefinition);
+ // Mockito.when(taskGroupQueueMapper.selectById(1)).thenReturn(taskGroupQueue);
+ // Mockito.when(processInstanceMapper.selectById(1)).thenReturn(processInstance);
+ // Mockito.when(triggerRelationService.saveProcessInstanceTrigger(Mockito.any(), Mockito.any()))
+ // .thenReturn(1);
+ // Mockito.when(processService.findRelationByCode(processDefinitionCode, processDefinitionVersion))
+ // .thenReturn(processTaskRelations);
+ // }
+ //
+ // /**
+ // * not complement
+ // */
+ // @Test
+ // public void testNoComplement() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.START_PROCESS,
+ // null, null,
+ // null, null, null,
+ // RunMode.RUN_MODE_SERIAL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 10, null, null,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // verify(commandService, times(1)).createCommand(any(Command.class));
+ //
+ // }
+ //
+ // /**
+ // * not complement
+ // */
+ // @Test
+ // public void testComplementWithStartNodeList() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.START_PROCESS,
+ // null, "123456789,987654321",
+ // null, null, null,
+ // RunMode.RUN_MODE_SERIAL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, null,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // verify(commandService, times(1)).createCommand(any(Command.class));
+ //
+ // }
+ //
+ // @Test
+ // public void testComplementWithOldStartNodeList() {
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = new HashMap<>();
+ // try {
+ // result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.START_PROCESS,
+ // null, "1123456789,987654321",
+ // null, null, null,
+ // RunMode.RUN_MODE_SERIAL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 0,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // } catch (ServiceException e) {
+ // Assertions.assertEquals(Status.START_NODE_NOT_EXIST_IN_LAST_PROCESS.getCode(), e.getCode());
+ // }
+ // }
+ //
+ // @Test
+ // public void testComplementWithDependentMode() {
+ // Schedule schedule = new Schedule();
+ // schedule.setStartTime(new Date());
+ // schedule.setEndTime(new Date());
+ // schedule.setCrontab("0 0 7 * * ? *");
+ // schedule.setFailureStrategy(FailureStrategy.CONTINUE);
+ // schedule.setReleaseState(ReleaseState.OFFLINE);
+ // schedule.setWarningType(WarningType.NONE);
+ // schedule.setCreateTime(new Date());
+ // schedule.setUpdateTime(new Date());
+ // List<Schedule> schedules = Lists.newArrayList(schedule);
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(
+ // processDefinitionCode))
+ // .thenReturn(schedules);
+ //
+ // DependentProcessDefinition dependentProcessDefinition = new DependentProcessDefinition();
+ // dependentProcessDefinition.setProcessDefinitionCode(2);
+ // dependentProcessDefinition.setProcessDefinitionVersion(1);
+ // dependentProcessDefinition.setTaskDefinitionCode(1);
+ // dependentProcessDefinition.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
+ // dependentProcessDefinition.setTaskParams(
+ // "{\"localParams\":[],\"resourceList\":[],\"dependence\":{\"relation\":\"AND\",\"dependTaskList\":[{\"relation\":\"AND\",\"dependItemList\":[{\"depTaskCode\":2,\"status\":\"SUCCESS\"}]}]},\"conditionResult\":{\"successNode\":[1],\"failedNode\":[1]}}");
+ // Mockito.when(processLineageService.queryDownstreamDependentProcessDefinitions(processDefinitionCode))
+ // .thenReturn(Lists.newArrayList(dependentProcessDefinition));
+ //
+ // Map<Long, String> processDefinitionWorkerGroupMap = new HashMap<>();
+ // processDefinitionWorkerGroupMap.put(1L, WorkerGroupUtils.getDefaultWorkerGroup());
+ // Mockito.when(workerGroupService.queryWorkerGroupByProcessDefinitionCodes(Lists.newArrayList(1L)))
+ // .thenReturn(processDefinitionWorkerGroupMap);
+ //
+ // Command command = new Command();
+ // command.setId(1);
+ // command.setCommandType(CommandType.COMPLEMENT_DATA);
+ // command.setCommandParam(
+ // "{\"StartNodeList\":\"1\",\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31
+ // 23:00:00\"}");
+ // command.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
+ // command.setProcessDefinitionCode(processDefinitionCode);
+ // command.setExecutorId(1);
+ //
+ // // not enable allLevelDependent
+ // int count = executorService.createComplementDependentCommand(schedules, command, false);
+ // Assertions.assertEquals(1, count);
+ //
+ // // enable allLevelDependent
+ // DependentProcessDefinition childDependent = new DependentProcessDefinition();
+ // childDependent.setProcessDefinitionCode(3);
+ // childDependent.setProcessDefinitionVersion(1);
+ // childDependent.setTaskDefinitionCode(4);
+ // childDependent.setWorkerGroup(WorkerGroupUtils.getDefaultWorkerGroup());
+ // childDependent.setTaskParams(
+ // "{\"localParams\":[],\"resourceList\":[],\"dependence\":{\"relation\":\"AND\",\"dependTaskList\":[{\"relation\":\"AND\",\"dependItemList\":[{\"depTaskCode\":3,\"status\":\"SUCCESS\"}]}]},\"conditionResult\":{\"successNode\":[1],\"failedNode\":[1]}}");
+ // Mockito.when(processLineageService.queryDownstreamDependentProcessDefinitions(
+ // dependentProcessDefinition.getProcessDefinitionCode())).thenReturn(Lists.newArrayList(childDependent))
+ // .thenReturn(Lists.newArrayList());
+ // int allLevelDependentCount = executorService.createComplementDependentCommand(schedules, command, true);
+ // Assertions.assertEquals(2, allLevelDependentCount);
+ // }
+ //
+ // /**
+ // * date error
+ // */
+ // @Test
+ // public void testDateError() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2022-01-07 12:12:12\",\"complementEndDate\":\"2022-01-06 12:12:12\"}",
+ // CommandType.COMPLEMENT_DATA,
+ // null, null,
+ // null, null, null,
+ // RunMode.RUN_MODE_SERIAL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 2,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.START_PROCESS_INSTANCE_ERROR, result.get(Constants.STATUS));
+ // verify(commandService, times(0)).createCommand(any(Command.class));
+ // }
+ //
+ // /**
+ // * serial
+ // */
+ // @Test
+ // public void testSerial() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.COMPLEMENT_DATA,
+ // null, null,
+ // null, null, null,
+ // RunMode.RUN_MODE_SERIAL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, null,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // verify(commandService, times(1)).createCommand(any(Command.class));
+ // }
+ //
+ // /**
+ // * without schedule
+ // */
+ // @Test
+ // public void testParallelWithOutSchedule() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(zeroSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.COMPLEMENT_DATA,
+ // null, null,
+ // null, null, null,
+ // RunMode.RUN_MODE_PARALLEL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 2,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ //
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // verify(commandService, times(2)).createCommand(any(Command.class));
+ // }
+ //
+ // /**
+ // * with schedule
+ // */
+ // @Test
+ // public void testParallelWithSchedule() {
+ //
+ // Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode))
+ // .thenReturn(oneSchedulerList());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.COMPLEMENT_DATA,
+ // null, null,
+ // null, null, null,
+ // RunMode.RUN_MODE_PARALLEL,
+ // Priority.LOW, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 15,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // verify(commandService, times(15)).createCommand(any(Command.class));
+ //
+ // }
+ //
+ // @Test
+ // public void testNoMasterServers() {
+ // Mockito.when(monitorService.listServer(RegistryNodeType.MASTER)).thenReturn(new ArrayList<>());
+ //
+ // Assertions.assertThrows(ServiceException.class, () -> executorService.execProcessInstance(
+ // loginUser,
+ // projectCode,
+ // processDefinitionCode,
+ // "{\"complementStartDate\":\"2020-01-01 00:00:00\",\"complementEndDate\":\"2020-01-31 23:00:00\"}",
+ // CommandType.COMPLEMENT_DATA,
+ // null,
+ // null,
+ // null,
+ // null,
+ // null,
+ // RunMode.RUN_MODE_PARALLEL,
+ // Priority.LOW,
+ // WorkerGroupUtils.getDefaultWorkerGroup(),
+ // tenantCode,
+ // 100L,
+ // 110,
+ // null,
+ // null,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_NO,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER));
+ // }
+ //
+ // @Test
+ // public void testExecuteRepeatRunning() {
+ // when(commandService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true);
+ // when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN))
+ // .thenReturn(checkProjectAndAuth());
+ // when(processInstanceDao.queryOptionalById(processInstanceId)).thenReturn(Optional.of(processInstance));
+ // when(processDefinitionService.queryWorkflowDefinitionThrowExceptionIfNotFound(processDefinitionCode,
+ // processDefinitionVersion)).thenReturn(processDefinition);
+ // Assertions.assertDoesNotThrow(() -> {
+ // executorService.controlWorkflowInstance(loginUser, processInstanceId, ExecuteType.REPEAT_RUNNING);
+ // });
+ // }
+ //
+ // @Test
+ // public void testOfTestRun() {
+ // Mockito.when(commandService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true);
+ // Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode, RERUN))
+ // .thenReturn(checkProjectAndAuth());
+ // Mockito.when(tenantMapper.queryByTenantCode(tenantCode)).thenReturn(new Tenant());
+ // Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
+ // 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, WorkerGroupUtils.getDefaultWorkerGroup(), tenantCode, 100L, 110, null, 15,
+ // Constants.DRY_RUN_FLAG_NO,
+ // Constants.TEST_FLAG_YES,
+ // ComplementDependentMode.OFF_MODE, null,
+ // false,
+ // ExecutionOrder.DESC_ORDER);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // }
+ //
+ // @Test
+ // public void testStartCheckByProcessDefinedCode() {
+ // List<Long> ids = Lists.newArrayList(1L);
+ // when(processService.findAllSubWorkflowDefinitionCode(1)).thenReturn(ids);
+ //
+ // List<ProcessDefinition> processDefinitionList = new ArrayList<>();
+ // ProcessDefinition processDefinition = new ProcessDefinition();
+ // processDefinition.setId(1);
+ // processDefinition.setReleaseState(ReleaseState.ONLINE);
+ // processDefinitionList.add(processDefinition);
+ // Mockito.when(processDefinitionMapper.queryDefinitionListByIdList(new Integer[ids.size()]))
+ // .thenReturn(processDefinitionList);
+ //
+ // Map<String, Object> result = executorService.startCheckByProcessDefinedCode(1L);
+ // Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+ // }
+ //
+ // private List<Server> getMasterServersList() {
+ // List<Server> masterServerList = new ArrayList<>();
+ // Server masterServer1 = new Server();
+ // masterServer1.setId(1);
+ // masterServer1.setHost("192.168.220.188");
+ // masterServer1.setPort(1121);
+ // masterServerList.add(masterServer1);
+ //
+ // Server masterServer2 = new Server();
+ // masterServer2.setId(2);
+ // masterServer2.setHost("192.168.220.189");
+ // masterServer2.setPort(1122);
+ // masterServerList.add(masterServer2);
+ //
+ // return masterServerList;
+ // }
+ //
+ // private List zeroSchedulerList() {
+ // return Collections.EMPTY_LIST;
+ // }
+ //
+ // private List<Schedule> oneSchedulerList() {
+ // List<Schedule> schedulerList = new LinkedList<>();
+ // Schedule schedule = new Schedule();
+ // schedule.setCrontab("0 0 0 1/2 * ?");
+ // schedulerList.add(schedule);
+ // return schedulerList;
+ // }
+ //
+ // private Map<String, Object> checkProjectAndAuth() {
+ // Map<String, Object> result = new HashMap<>();
+ // result.put(Constants.STATUS, Status.SUCCESS);
+ // return result;
+ // }
+ //
+ // @Test
+ // public void testCreateComplementToParallel() {
+ // List<String> result = new ArrayList<>();
+ // int expectedParallelismNumber = 3;
+ // LinkedList<Integer> listDate = new LinkedList<>();
+ // listDate.add(0);
+ // listDate.add(1);
+ // listDate.add(2);
+ // listDate.add(3);
+ // listDate.add(4);
+ //
+ // int listDateSize = listDate.size();
+ // int createCount = Math.min(listDate.size(), expectedParallelismNumber);
+ // logger.info("In parallel mode, current expectedParallelismNumber:{}", createCount);
+ //
+ // int itemsPerCommand = (listDateSize / createCount);
+ // int remainingItems = (listDateSize % createCount);
+ // int startDateIndex = 0;
+ // int endDateIndex = 0;
+ //
+ // for (int i = 1; i <= createCount; i++) {
+ // int extra = (i <= remainingItems) ? 1 : 0;
+ // int singleCommandItems = (itemsPerCommand + extra);
+ //
+ // if (i == 1) {
+ // endDateIndex += singleCommandItems - 1;
+ // } else {
+ // startDateIndex = endDateIndex + 1;
+ // endDateIndex += singleCommandItems;
+ // }
+ //
+ // logger.info("startDate:{}, endDate:{}", listDate.get(startDateIndex), listDate.get(endDateIndex));
+ // result.add(listDate.get(startDateIndex) + "," + listDate.get(endDateIndex));
+ // }
+ //
+ // Assertions.assertEquals("0,1", result.get(0));
+ // Assertions.assertEquals("2,3", result.get(1));
+ // Assertions.assertEquals("4,4", result.get(2));
+ // }
+ //
+ // @Test
+ // public void testExecuteTask() {
+ // String startNodeList = "1234567870";
+ // TaskDependType taskDependType = TaskDependType.TASK_ONLY;
+ //
+ // ProcessInstance processInstanceMock = Mockito.mock(ProcessInstance.class, RETURNS_DEEP_STUBS);
+ // Mockito.when(processService.findProcessInstanceDetailById(processInstanceId))
+ // .thenReturn(Optional.ofNullable(processInstanceMock));
+ //
+ // ProcessDefinition processDefinition = new ProcessDefinition();
+ // processDefinition.setProjectCode(projectCode);
+ // Mockito.when(processService.findProcessDefinition(Mockito.anyLong(), Mockito.anyInt()))
+ // .thenReturn(processDefinition);
+ //
+ // Mockito.when(processService.getTenantForProcess(Mockito.anyString(), Mockito.anyInt())).thenReturn(tenantCode);
+ //
+ // when(processInstanceMock.getState().isFinished()).thenReturn(false);
+ // WorkflowExecuteResponse responseInstanceIsNotFinished =
+ // executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
+ // Assertions.assertEquals(Status.WORKFLOW_INSTANCE_IS_NOT_FINISHED.getCode(),
+ // responseInstanceIsNotFinished.getCode());
+ //
+ // when(processInstanceMock.getState().isFinished()).thenReturn(true);
+ // WorkflowExecuteResponse responseStartNodeListError =
+ // executorService.executeTask(loginUser, projectCode, processInstanceId, "1234567870,", taskDependType);
+ // Assertions.assertEquals(Status.REQUEST_PARAMS_NOT_VALID_ERROR.getCode(), responseStartNodeListError.getCode());
+ //
+ // Mockito.when(taskDefinitionLogMapper.queryMaxVersionForDefinition(Mockito.anyLong())).thenReturn(null);
+ // WorkflowExecuteResponse responseNotDefineTask =
+ // executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
+ // Assertions.assertEquals(Status.EXECUTE_NOT_DEFINE_TASK.getCode(), responseNotDefineTask.getCode());
+ //
+ // Mockito.when(taskDefinitionLogMapper.queryMaxVersionForDefinition(Mockito.anyLong())).thenReturn(1);
+ // Mockito.when(commandService.verifyIsNeedCreateCommand(any())).thenReturn(true);
+ // WorkflowExecuteResponse responseSuccess =
+ // executorService.executeTask(loginUser, projectCode, processInstanceId, startNodeList, taskDependType);
+ // Assertions.assertEquals(Status.SUCCESS.getCode(), responseSuccess.getCode());
+ //
+ // }
+
+}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
index 27a2dc7ac3..e54c5b1b4f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@@ -22,9 +22,6 @@ import java.util.Map;
import com.baomidou.mybatisplus.annotation.EnumValue;
-/**
- * command types
- */
public enum CommandType {
/**
@@ -43,19 +40,62 @@ public enum CommandType {
* 11 recover serial wait
* 12 start a task node in a process instance
*/
+ /**
+ * Start the workflow definition, will generate a new workflow instance and start from the StartNodeList, if StartNodeList is empty will start from the beginning tasks.
+ */
START_PROCESS(0, "start a new process"),
+ /**
+ * todo: remove this command, this command doesn't used?
+ */
START_CURRENT_TASK_PROCESS(1, "start a new process from current nodes"),
+ /**
+ * Recover the workflow instance from tolerance fault, these may happened when the master is crashed.
+ * Will recover the workflow instance from the last running task node.
+ */
RECOVER_TOLERANCE_FAULT_PROCESS(2, "recover tolerance fault process"),
- RECOVER_SUSPENDED_PROCESS(3, "recover suspended process"),
- START_FAILURE_TASK_PROCESS(4, "start process from failure task nodes"),
+ /**
+ * Recover the workflow instance from pause status, will start from the paused and unTriggered task instance.
+ */
+ RECOVER_SUSPENDED_PROCESS(3, "Recover suspended workflow instance"),
+ /**
+ * Recover the workflow instance from failure task nodes, will start from the failed task nodes.
+ * In fact this command has the same logic with RECOVER_SUSPENDED_PROCESS.
+ */
+ START_FAILURE_TASK_PROCESS(4, "Recover workflow instance from failure tasks"),
+ /**
+ * Backfill the workflow, will use complementScheduleDateList to generate the workflow instance.
+ */
COMPLEMENT_DATA(5, "complement data"),
+ /**
+ * Start workflow from scheduler, will generate a new workflow instance and start from the beginning tasks.
+ * This command is same with START_PROCESS but with different trigger source.
+ */
SCHEDULER(6, "start a new process from scheduler"),
+ /**
+ * Repeat running a workflow instance, will mark the history task instances' flag to no and start from the beginning tasks.
+ */
REPEAT_RUNNING(7, "repeat running a process"),
+ /**
+ * Pause a workflow instance, will pause the running tasks, but not all tasks will be paused.
+ */
PAUSE(8, "pause a process"),
+ /**
+ * Stop a workflow instance, will kill the running tasks.
+ */
STOP(9, "stop a process"),
- RECOVER_WAITING_THREAD(10, "recover waiting thread"),
+ /**
+ * Recover from the serial-wait state.
+ * todo: We may need to remove these command, and use the workflow instance origin command type when notify from serial wait.
+ */
RECOVER_SERIAL_WAIT(11, "recover serial wait"),
+ /**
+ * Trigger the workflow instance from the given StartNodeList, will mark the task instance which is behind the given StartNodeList flag to no
+ * and retrigger the task instances.
+ */
EXECUTE_TASK(12, "start a task node in a process instance"),
+ /**
+ * Used in dynamic logic task instance.
+ */
DYNAMIC_GENERATION(13, "dynamic generation"),
;
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
index a080a6c826..68fdb2a96f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
@@ -53,4 +53,11 @@ public enum Flag {
public String getDescp() {
return descp;
}
+
+ public static Flag of(int code) {
+ if (code == 0) {
+ return NO;
+ }
+ return YES;
+ }
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProcessExecutionTypeEnum.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProcessExecutionTypeEnum.java
index 50c46fd45e..c6306e7cd3 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProcessExecutionTypeEnum.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProcessExecutionTypeEnum.java
@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
public enum ProcessExecutionTypeEnum {
PARALLEL(0, "parallel"),
+ // todo: the serial is unstable, so we don't support them now
SERIAL_WAIT(1, "serial wait"),
SERIAL_DISCARD(2, "serial discard"),
SERIAL_PRIORITY(3, "serial priority");
@@ -45,22 +46,6 @@ public enum ProcessExecutionTypeEnum {
}
}
- public boolean typeIsSerial() {
- return this != PARALLEL;
- }
-
- public boolean typeIsSerialWait() {
- return this == SERIAL_WAIT;
- }
-
- public boolean typeIsSerialDiscard() {
- return this == SERIAL_DISCARD;
- }
-
- public boolean typeIsSerialPriority() {
- return this == SERIAL_PRIORITY;
- }
-
public int getCode() {
return code;
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
index 220b56a939..79a3926da2 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
@@ -21,13 +21,10 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
public enum StateEventType {
- PROCESS_STATE_CHANGE(0, "process state change"),
TASK_STATE_CHANGE(1, "task state change"),
- PROCESS_TIMEOUT(2, "process timeout"),
TASK_TIMEOUT(3, "task timeout"),
- WAKE_UP_TASK_GROUP(4, "wait task group"),
TASK_RETRY(5, "task retry"),
- PROCESS_SUBMIT_FAILED(7, "process submit failed");
+ ;
StateEventType(int code, String descp) {
this.code = code;
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
index 923192ea7b..7df8d451fc 100644
--- 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
@@ -26,9 +26,6 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
public enum WorkflowExecutionStatus {
- // This class is split from <code>ExecutionStatus</code> #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"),
@@ -36,24 +33,19 @@ public enum WorkflowExecutionStatus {
STOP(5, "stop"),
FAILURE(6, "failure"),
SUCCESS(7, "success"),
- DELAY_EXECUTION(12, "delay execution"),
SERIAL_WAIT(14, "serial wait"),
WAIT_TO_RUN(17, "wait to run"),
- ;
+ FAILOVER(18, "failover");
private static final Map<Integer, WorkflowExecutionStatus> 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()
};
private static final int[] NOT_TERMINAL_STATUS = new int[]{
- SUBMITTED_SUCCESS.getCode(),
RUNNING_EXECUTION.getCode(),
- DELAY_EXECUTION.getCode(),
READY_PAUSE.getCode(),
READY_STOP.getCode(),
SERIAL_WAIT.getCode(),
@@ -83,11 +75,28 @@ public enum WorkflowExecutionStatus {
}
public boolean canStop() {
- return this == RUNNING_EXECUTION || this == READY_PAUSE;
+ return this == RUNNING_EXECUTION
+ || this == READY_PAUSE
+ || this == READY_STOP
+ || this == SERIAL_WAIT
+ || this == WAIT_TO_RUN;
+ }
+
+ public boolean canDirectStopInDB() {
+ return this == SERIAL_WAIT || this == WAIT_TO_RUN;
+ }
+
+ public boolean canPause() {
+ return this == RUNNING_EXECUTION
+ || this == READY_PAUSE
+ || this == SERIAL_WAIT;
+ }
+
+ public boolean canDirectPauseInDB() {
+ return this == SERIAL_WAIT || this == WAIT_TO_RUN;
}
public boolean isFinished() {
- // todo: do we need to remove pause/block in finished judge?
return isSuccess() || isFailure() || isStop() || isPause();
}
@@ -144,6 +153,6 @@ public enum WorkflowExecutionStatus {
@Override
public String toString() {
- return "WorkflowExecutionStatus{" + "code=" + code + ", desc='" + desc + '\'' + '}';
+ return name();
}
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/DefaultUncaughtExceptionHandler.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/DefaultUncaughtExceptionHandler.java
index 62a0fd6911..30c23aec73 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/DefaultUncaughtExceptionHandler.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/DefaultUncaughtExceptionHandler.java
@@ -19,18 +19,17 @@ package org.apache.dolphinscheduler.common.thread;
import java.util.concurrent.atomic.LongAdder;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
+@NoArgsConstructor(access = lombok.AccessLevel.PRIVATE)
public class DefaultUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
private static final DefaultUncaughtExceptionHandler INSTANCE = new DefaultUncaughtExceptionHandler();
private static final LongAdder uncaughtExceptionCount = new LongAdder();
- private DefaultUncaughtExceptionHandler() {
- }
-
public static DefaultUncaughtExceptionHandler getInstance() {
return INSTANCE;
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
index a24f4ac615..932da89d6b 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java
@@ -31,22 +31,33 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@Slf4j
public class ThreadUtils {
- public static ThreadPoolExecutor newDaemonFixedThreadExecutor(String threadName, int threadsNum) {
- return (ThreadPoolExecutor) Executors.newFixedThreadPool(threadsNum, newDaemonThreadFactory(threadName));
+ public static ThreadPoolExecutor newDaemonFixedThreadExecutor(String threadNameFormat, int threadsNum) {
+ return (ThreadPoolExecutor) Executors.newFixedThreadPool(threadsNum, newDaemonThreadFactory(threadNameFormat));
}
- public static ScheduledExecutorService newSingleDaemonScheduledExecutorService(String threadName) {
- return Executors.newSingleThreadScheduledExecutor(newDaemonThreadFactory(threadName));
+ public static ScheduledExecutorService newSingleDaemonScheduledExecutorService(String threadNameFormat) {
+ return Executors.newSingleThreadScheduledExecutor(newDaemonThreadFactory(threadNameFormat));
}
- public static ScheduledExecutorService newDaemonScheduledExecutorService(String threadName, int threadsNum) {
- return Executors.newScheduledThreadPool(threadsNum, newDaemonThreadFactory(threadName));
+ /**
+ * Create a daemon scheduler thread pool, the thread name will be formatted with the given name.
+ *
+ * @param threadNameFormat the thread name format, e.g. "DemonThread-%d"
+ * @param threadsNum the number of threads in the pool
+ */
+ public static ScheduledExecutorService newDaemonScheduledExecutorService(String threadNameFormat, int threadsNum) {
+ return Executors.newScheduledThreadPool(threadsNum, newDaemonThreadFactory(threadNameFormat));
}
- public static ThreadFactory newDaemonThreadFactory(String threadName) {
+ /**
+ * Create a daemon thread factory, the thread name will be formatted with the given name.
+ *
+ * @param threadNameFormat the thread name format, e.g. "DS-DemonThread-%d"
+ */
+ public static ThreadFactory newDaemonThreadFactory(String threadNameFormat) {
return new ThreadFactoryBuilder()
.setDaemon(true)
- .setNameFormat(threadName)
+ .setNameFormat(threadNameFormat)
.setUncaughtExceptionHandler(DefaultUncaughtExceptionHandler.getInstance())
.build();
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
index 16182ccda6..18370ae378 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java
@@ -67,6 +67,11 @@ public final class DateUtils {
return date2LocalDateTime(date, zoneId);
}
+ public static String getTimezone() {
+ String timezone = ThreadLocalContext.getTimezoneThreadLocal().get();
+ return StringUtils.isNotEmpty(timezone) ? timezone : ZoneId.systemDefault().getId();
+ }
+
/**
* date to local datetime
*
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/thread/ThreadUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/thread/ThreadUtilsTest.java
index 7d7b2c0ac6..2323b478f2 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/thread/ThreadUtilsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/thread/ThreadUtilsTest.java
@@ -17,9 +17,12 @@
package org.apache.dolphinscheduler.common.thread;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
class ThreadUtilsTest {
@@ -31,7 +34,16 @@ class ThreadUtilsTest {
throw new IllegalArgumentException("I am an exception");
});
Thread.sleep(1_000);
- Assertions.assertEquals(1, DefaultUncaughtExceptionHandler.getUncaughtExceptionCount());
+ assertEquals(1, DefaultUncaughtExceptionHandler.getUncaughtExceptionCount());
+
+ }
+ @Test
+ void newDaemonThreadFactory() {
+ final ThreadFactory threadFactory = ThreadUtils.newDaemonThreadFactory("DemonThread-%d");
+ final Thread thread = threadFactory.newThread(() -> {
+ });
+ assertTrue(thread.isDaemon());
+ assertEquals("DemonThread-0", thread.getName());
}
}
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 82c969ca3d..0da49bb228 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
@@ -241,7 +241,8 @@ public class AlertDao {
* @param taskInstance taskInstance
* @param projectUser projectUser
*/
- public void sendTaskTimeoutAlert(ProcessInstance processInstance, TaskInstance taskInstance,
+ public void sendTaskTimeoutAlert(ProcessInstance processInstance,
+ TaskInstance taskInstance,
ProjectUser projectUser) {
Alert alert = new Alert();
List<ProcessAlertContent> processAlertContentList = new ArrayList<>(1);
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 9ed8bca0ef..ba96ba2a0a 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
@@ -34,6 +34,7 @@ import java.util.Date;
import java.util.List;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -49,6 +50,8 @@ import com.google.common.base.Strings;
*/
@NoArgsConstructor
@Data
+@Builder
+@AllArgsConstructor
@TableName("t_ds_process_instance")
public class ProcessInstance {
@@ -89,14 +92,17 @@ public class ProcessInstance {
private String host;
+ @Deprecated
@TableField(exist = false)
private ProcessDefinition processDefinition;
+
private CommandType commandType;
private String commandParam;
private TaskDependType taskDependType;
+ @Deprecated
private int maxTryTimes;
private FailureStrategy failureStrategy;
@@ -189,6 +195,7 @@ public class ProcessInstance {
/**
* serial queue next processInstanceId
*/
+ @Deprecated
private int nextProcessInstanceId;
/**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java
index 09f5cf65cb..6e28f6789e 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java
@@ -22,6 +22,8 @@ import org.apache.dolphinscheduler.common.utils.JSONUtils;
import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -32,6 +34,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@Data
+@Builder
+@AllArgsConstructor
@NoArgsConstructor
@TableName("t_ds_process_task_relation")
public class ProcessTaskRelation {
@@ -85,6 +89,7 @@ public class ProcessTaskRelation {
/**
* condition type
*/
+ @Deprecated
private ConditionType conditionType;
/**
@@ -92,6 +97,7 @@ public class ProcessTaskRelation {
*/
@JsonDeserialize(using = JSONUtils.JsonDataDeserializer.class)
@JsonSerialize(using = JSONUtils.JsonDataSerializer.class)
+ @Deprecated
private String conditionParams;
/**
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
index a8f339082f..1ca6be744b 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
@@ -24,7 +24,10 @@ import org.apache.dolphinscheduler.common.enums.WarningType;
import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -32,6 +35,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("t_ds_schedules")
public class Schedule {
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
index 2fd2b02987..02323d29b0 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
@@ -34,7 +34,10 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -47,6 +50,9 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.base.Strings;
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@TableName("t_ds_task_definition")
public class TaskDefinition {
@@ -112,6 +118,7 @@ public class TaskDefinition {
/**
* task is valid: yes/no
+ * // todo: remove the flag field
*/
private Flag flag;
@@ -224,9 +231,6 @@ public class TaskDefinition {
*/
private TaskExecuteType taskExecuteType;
- public TaskDefinition() {
- }
-
public TaskDefinition(long code, int version) {
this.code = code;
this.version = version;
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 943b4ac2db..a0bebbbe08 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
@@ -68,7 +68,7 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* query process instance by tenantCode and stateArray
*
* @param tenantCode tenantCode
- * @param states states array
+ * @param states states array
* @return process instance list
*/
List<ProcessInstance> queryByTenantCodeAndStatus(@Param("tenantCode") String tenantCode,
@@ -103,7 +103,7 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* @param projectCode projectCode
* @param processDefinitionCode processDefinitionCode
* @param searchVal searchVal
- * @param executorName executorName
+ * @param executorName executorName
* @param statusArray statusArray
* @param host host
* @param startTime startTime
@@ -131,14 +131,12 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
@Param("states") int[] stateArray);
/**
- * update process instance by state
- *
- * @param originState originState
- * @param destState destState
- * @return update result
+ * Update the workflow instance state from originState to destState
*/
- int updateProcessInstanceByState(@Param("originState") WorkflowExecutionStatus originState,
- @Param("destState") WorkflowExecutionStatus destState);
+ int updateWorkflowInstanceState(
+ @Param("workflowInstanceId") Integer workflowInstanceId,
+ @Param("originState") WorkflowExecutionStatus originState,
+ @Param("targetState") WorkflowExecutionStatus targetState);
/**
* update process instance by tenantCode
@@ -189,10 +187,10 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* query last scheduler process instance
*
* @param processDefinitionCode definitionCode
- * @param taskDefinitionCode definitionCode
- * @param startTime startTime
- * @param endTime endTime
- * @param testFlag testFlag
+ * @param taskDefinitionCode definitionCode
+ * @param startTime startTime
+ * @param endTime endTime
+ * @param testFlag testFlag
* @return process instance
*/
ProcessInstance queryLastSchedulerProcess(@Param("processDefinitionCode") Long processDefinitionCode,
@@ -205,7 +203,7 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* query last manual process instance
*
* @param definitionCode definitionCode
- * @param taskCode taskCode
+ * @param taskCode taskCode
* @param startTime startTime
* @param endTime endTime
* @param testFlag testFlag
@@ -308,8 +306,8 @@ public interface ProcessInstanceMapper extends BaseMapper<ProcessInstance> {
* @param endTime endTime
* @param projectCode projectCode
* @param workflowCode workflowCode
- * @param model model
- * @param projectIds projectIds
+ * @param model model
+ * @param projectIds projectIds
* @return ExecuteStatusCount list
*/
List<ExecuteStatusCount> countInstanceStateV2(
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 f80dac826c..3c9a982742 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
@@ -147,4 +147,8 @@ public interface TaskInstanceMapper extends BaseMapper<TaskInstance> {
TaskInstance findLastTaskInstance(@Param("processInstanceId") Integer processInstanceId,
@Param("taskCode") long depTaskCode,
@Param("testFlag") int testFlag);
+
+ void updateTaskInstanceState(@Param("taskInstanceId") Integer taskInstanceId,
+ @Param("originState") int originState,
+ @Param("targetState") int targetState);
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProcessInstanceDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProcessInstanceDao.java
index 91c567e2e3..6c05564d4c 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProcessInstanceDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProcessInstanceDao.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.dao.repository;
+import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval;
@@ -31,6 +32,13 @@ public interface ProcessInstanceDao extends IDao<ProcessInstance> {
*/
void upsertProcessInstance(ProcessInstance processInstance);
+ /**
+ * Update workflow instance from originState to targetState
+ */
+ void updateWorkflowInstanceState(Integer workflowInstanceId,
+ WorkflowExecutionStatus originState,
+ WorkflowExecutionStatus targetState);
+
/**
* performs an "upsert" operation (update or insert) on a ProcessInstance object within a new transaction
*
@@ -42,8 +50,8 @@ public interface ProcessInstanceDao extends IDao<ProcessInstance> {
* find last scheduler process instance in the date interval
*
* @param processDefinitionCode definitionCode
- * @param taskDefinitionCode definitionCode
- * @param dateInterval dateInterval
+ * @param taskDefinitionCode definitionCode
+ * @param dateInterval dateInterval
* @return process instance
*/
ProcessInstance queryLastSchedulerProcessInterval(Long processDefinitionCode, Long taskDefinitionCode,
@@ -53,7 +61,7 @@ public interface ProcessInstanceDao extends IDao<ProcessInstance> {
* find last manual process instance interval
*
* @param definitionCode process definition code
- * @param taskCode taskCode
+ * @param taskCode taskCode
* @param dateInterval dateInterval
* @return process instance
*/
@@ -81,4 +89,11 @@ public interface ProcessInstanceDao extends IDao<ProcessInstance> {
List<ProcessInstance> queryByWorkflowCodeVersionStatus(Long workflowDefinitionCode,
int workflowDefinitionVersion,
int[] states);
+
+ List<String> queryNeedFailoverMasters();
+
+ /**
+ * Query the workflow instances under the master that need to be failover.
+ */
+ List<ProcessInstance> queryNeedFailoverWorkflowInstances(String masterAddress);
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProjectDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProjectDao.java
index a03f509fb5..9caa42f1e9 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProjectDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/ProjectDao.java
@@ -26,4 +26,6 @@ public interface ProjectDao extends IDao<Project> {
List<Project> queryByCodes(Collection<Long> projectCodes);
+ Project queryByCode(Long projectCode);
+
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java
index 27a0dbb0f6..1ce38d7e1b 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.dao.repository;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import java.util.List;
import java.util.Set;
@@ -40,30 +41,39 @@ public interface TaskInstanceDao extends IDao<TaskInstance> {
/**
* Submit a task instance to DB.
- * @param taskInstance task instance
+ *
+ * @param taskInstance task instance
* @param processInstance process instance
* @return task instance
*/
boolean submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance);
+ /**
+ * Mark the task instance as invalid
+ */
+ void markTaskInstanceInvalid(List<TaskInstance> taskInstances);
+
/**
* Query list of valid task instance by process instance id
+ *
* @param processInstanceId processInstanceId
- * @param testFlag test flag
+ * @param testFlag test flag
* @return list of valid task instance
*/
List<TaskInstance> queryValidTaskListByWorkflowInstanceId(Integer processInstanceId, int testFlag);
/**
* Query list of task instance by process instance id and task code
+ *
* @param processInstanceId processInstanceId
- * @param taskCode task code
+ * @param taskCode task code
* @return list of valid task instance
*/
TaskInstance queryByWorkflowInstanceIdAndTaskCode(Integer processInstanceId, Long taskCode);
/**
* find previous task list by work process id
+ *
* @param processInstanceId processInstanceId
* @return task instance list
*/
@@ -71,6 +81,7 @@ public interface TaskInstanceDao extends IDao<TaskInstance> {
/**
* find task instance by cache_key
+ *
* @param cacheKey cache key
* @return task instance
*/
@@ -78,6 +89,7 @@ public interface TaskInstanceDao extends IDao<TaskInstance> {
/**
* clear task instance cache by cache_key
+ *
* @param cacheKey cache key
* @return task instance
*/
@@ -91,8 +103,8 @@ public interface TaskInstanceDao extends IDao<TaskInstance> {
* find last task instance list corresponding to taskCodes in the date interval
*
* @param processInstanceId Task's parent process instance id
- * @param taskCodes taskCodes
- * @param testFlag test flag
+ * @param taskCodes taskCodes
+ * @param testFlag test flag
* @return task instance list
*/
List<TaskInstance> queryLastTaskInstanceListIntervalInProcessInstance(Integer processInstanceId,
@@ -108,4 +120,7 @@ public interface TaskInstanceDao extends IDao<TaskInstance> {
*/
TaskInstance queryLastTaskInstanceIntervalInProcessInstance(Integer processInstanceId,
long depTaskCode, int testFlag);
+
+ void updateTaskInstanceState(Integer taskInstanceId, TaskExecutionStatus originState,
+ TaskExecutionStatus targetState);
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImpl.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImpl.java
index 8e966c1850..0c8305f981 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImpl.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImpl.java
@@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.dao.repository.impl;
+import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
@@ -58,6 +59,22 @@ public class ProcessInstanceDaoImpl extends BaseDao<ProcessInstance, ProcessInst
}
}
+ @Override
+ public void updateWorkflowInstanceState(Integer workflowInstanceId, WorkflowExecutionStatus originalStatus,
+ WorkflowExecutionStatus targetStatus) {
+ int update = mybatisMapper.updateWorkflowInstanceState(workflowInstanceId, originalStatus, targetStatus);
+ if (update != 1) {
+ ProcessInstance processInstance = mybatisMapper.selectById(workflowInstanceId);
+ if (processInstance == null) {
+ throw new UnsupportedOperationException("updateWorkflowInstance " + workflowInstanceId
+ + " state failed, the workflow instance is not exist in db");
+ }
+ throw new UnsupportedOperationException(
+ "updateWorkflowInstance " + workflowInstanceId + " state failed, expect original state is "
+ + originalStatus.name() + " actual state is : {} " + processInstance.getState().name());
+ }
+ }
+
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
public void performTransactionalUpsert(ProcessInstance processInstance) {
@@ -68,8 +85,8 @@ public class ProcessInstanceDaoImpl extends BaseDao<ProcessInstance, ProcessInst
* find last scheduler process instance in the date interval
*
* @param processDefinitionCode definitionCode
- * @param taskDefinitionCode definitionCode
- * @param dateInterval dateInterval
+ * @param taskDefinitionCode definitionCode
+ * @param dateInterval dateInterval
* @return process instance
*/
@Override
@@ -143,4 +160,16 @@ public class ProcessInstanceDaoImpl extends BaseDao<ProcessInstance, ProcessInst
return mybatisMapper.queryByWorkflowCodeVersionStatus(workflowDefinitionCode, workflowDefinitionVersion,
states);
}
+
+ @Override
+ public List<String> queryNeedFailoverMasters() {
+ return mybatisMapper
+ .queryNeedFailoverProcessInstanceHost(WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
+ }
+
+ @Override
+ public List<ProcessInstance> queryNeedFailoverWorkflowInstances(String masterAddress) {
+ return mybatisMapper.queryByHostAndStatus(masterAddress,
+ WorkflowExecutionStatus.getNeedFailoverWorkflowInstanceState());
+ }
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProjectDaoImpl.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProjectDaoImpl.java
index 91fbed782f..f3f0c3b039 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProjectDaoImpl.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/ProjectDaoImpl.java
@@ -40,4 +40,9 @@ public class ProjectDaoImpl extends BaseDao<Project, ProjectMapper> implements P
public List<Project> queryByCodes(Collection<Long> projectCodes) {
return mybatisMapper.queryByCodes(projectCodes);
}
+
+ @Override
+ public Project queryByCode(Long projectCode) {
+ return mybatisMapper.queryByCode(projectCode);
+ }
}
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java
index 7e96bcd68b..1245d3ef6f 100644
--- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java
+++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java
@@ -28,6 +28,7 @@ import org.apache.dolphinscheduler.dao.repository.BaseDao;
import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.Date;
@@ -88,6 +89,17 @@ public class TaskInstanceDaoImpl extends BaseDao<TaskInstance, TaskInstanceMappe
return upsertTaskInstance(taskInstance);
}
+ @Override
+ public void markTaskInstanceInvalid(List<TaskInstance> taskInstances) {
+ if (CollectionUtils.isEmpty(taskInstances)) {
+ return;
+ }
+ for (TaskInstance taskInstance : taskInstances) {
+ taskInstance.setFlag(Flag.NO);
+ mybatisMapper.updateById(taskInstance);
+ }
+ }
+
private TaskExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) {
TaskExecutionStatus state = taskInstance.getState();
if (state == TaskExecutionStatus.RUNNING_EXECUTION
@@ -184,4 +196,11 @@ public class TaskInstanceDaoImpl extends BaseDao<TaskInstance, TaskInstanceMappe
int testFlag) {
return mybatisMapper.findLastTaskInstance(processInstanceId, depTaskCode, testFlag);
}
+
+ @Override
+ public void updateTaskInstanceState(Integer taskInstanceId,
+ TaskExecutionStatus originState,
+ TaskExecutionStatus targetState) {
+ mybatisMapper.updateTaskInstanceState(taskInstanceId, originState.getCode(), targetState.getCode());
+ }
}
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index b31bb571d7..61274b43d7 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -152,10 +152,10 @@
</foreach>
</if>
</update>
- <update id="updateProcessInstanceByState">
+ <update id="updateWorkflowInstanceState">
update t_ds_process_instance
- set state = #{destState}
- where state = #{originState}
+ set state = #{targetState}
+ where id = #{workflowInstanceId} and state = #{originState}
</update>
<update id="updateProcessInstanceByTenantCode">
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskLineageMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskLineageMapper.xml
index 0b11d730ac..b164f36b56 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskLineageMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskLineageMapper.xml
@@ -91,22 +91,6 @@
and pd.project_code = #{projectCode}
</select>
- <select id="queryWorkFlowLineageByCode" resultType="org.apache.dolphinscheduler.dao.entity.WorkFlowRelationDetail">
- select
- pd.code as work_flow_code
- ,pd.name as work_flow_name
- ,pd.release_state as work_flow_publish_status
- ,schd.start_time as schedule_start_time
- ,schd.end_time as schedule_end_time
- ,schd.crontab as crontab
- ,schd.release_state as schedule_publish_status
- from t_ds_process_definition pd
- left join t_ds_schedules schd on pd.code = schd.process_definition_code
- where 1=1
- and pd.code = #{processDefinitionCode}
- and pd.project_code = #{projectCode}
- </select>
-
<select id="queryWorkFlowLineageByDept" resultType="org.apache.dolphinscheduler.dao.entity.ProcessTaskLineage">
select
<include refid="baseSql"/>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 548baae566..9823b6fed1 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -279,6 +279,12 @@
order by end_time desc limit 1
</select>
+ <delete id="updateTaskInstanceState">
+ update t_ds_task_instance
+ set state = #{targetState}
+ where id = #{taskInstanceId} and state = #{originState}
+ </delete>
+
<delete id="deleteByWorkflowInstanceId">
delete
from t_ds_task_instance
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 0aae0dce2b..eb71156ff0 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
@@ -78,7 +78,7 @@ public class ProcessInstanceMapperTest extends BaseDaoTest {
processInstance.setProjectCode(1L);
processInstance.setStartTime(start);
processInstance.setEndTime(end);
- processInstance.setState(WorkflowExecutionStatus.SUBMITTED_SUCCESS);
+ processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
processInstance.setTestFlag(0);
processInstanceMapper.insert(processInstance);
return processInstance;
@@ -207,7 +207,9 @@ public class ProcessInstanceMapperTest extends BaseDaoTest {
processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
processInstanceMapper.updateById(processInstance);
- processInstanceMapper.updateProcessInstanceByState(WorkflowExecutionStatus.RUNNING_EXECUTION,
+
+ processInstanceMapper.updateWorkflowInstanceState(processInstance.getId(),
+ WorkflowExecutionStatus.RUNNING_EXECUTION,
WorkflowExecutionStatus.SUCCESS);
ProcessInstance processInstance1 = processInstanceMapper.selectById(processInstance.getId());
diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImplTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImplTest.java
index 9f69b7d90f..47d7f6cee2 100644
--- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImplTest.java
+++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/repository/impl/ProcessInstanceDaoImplTest.java
@@ -18,7 +18,9 @@
package org.apache.dolphinscheduler.dao.repository.impl;
import static org.apache.commons.collections4.CollectionUtils.isEmpty;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
@@ -26,6 +28,7 @@ import org.apache.dolphinscheduler.dao.BaseDaoTest;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.repository.ProcessInstanceDao;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,12 +56,8 @@ class ProcessInstanceDaoImplTest extends BaseDaoTest {
assertTrue(isEmpty(processInstanceDao.queryByWorkflowCodeVersionStatus(workflowDefinitionCode,
workflowDefinitionVersion, status)));
- processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
- WorkflowExecutionStatus.SUBMITTED_SUCCESS));
processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
WorkflowExecutionStatus.RUNNING_EXECUTION));
- processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
- WorkflowExecutionStatus.DELAY_EXECUTION));
processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
WorkflowExecutionStatus.READY_PAUSE));
processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
@@ -67,10 +66,39 @@ class ProcessInstanceDaoImplTest extends BaseDaoTest {
WorkflowExecutionStatus.SERIAL_WAIT));
processInstanceDao.insert(createWorkflowInstance(workflowDefinitionCode, workflowDefinitionVersion,
WorkflowExecutionStatus.WAIT_TO_RUN));
- assertEquals(7, processInstanceDao
+ assertEquals(5, processInstanceDao
.queryByWorkflowCodeVersionStatus(workflowDefinitionCode, workflowDefinitionVersion, status).size());
}
+ @Test
+ void updateWorkflowInstanceState_success() {
+ ProcessInstance workflowInstance = createWorkflowInstance(
+ 1L, 1, WorkflowExecutionStatus.RUNNING_EXECUTION);
+ processInstanceDao.insert(workflowInstance);
+
+ assertDoesNotThrow(() -> processInstanceDao.updateWorkflowInstanceState(
+ workflowInstance.getId(),
+ WorkflowExecutionStatus.RUNNING_EXECUTION,
+ WorkflowExecutionStatus.SUCCESS));
+ }
+
+ @Test
+ void updateWorkflowInstanceState_failed() {
+ ProcessInstance workflowInstance = createWorkflowInstance(
+ 1L, 1, WorkflowExecutionStatus.RUNNING_EXECUTION);
+ processInstanceDao.insert(workflowInstance);
+
+ UnsupportedOperationException unsupportedOperationException = assertThrows(UnsupportedOperationException.class,
+ () -> processInstanceDao.updateWorkflowInstanceState(
+ workflowInstance.getId(),
+ WorkflowExecutionStatus.READY_STOP,
+ WorkflowExecutionStatus.STOP));
+ Assertions.assertEquals("updateWorkflowInstance " + workflowInstance.getId()
+ + " state failed, expect original state is " + WorkflowExecutionStatus.READY_STOP.name()
+ + " actual state is : {} " + workflowInstance.getState().name(),
+ unsupportedOperationException.getMessage());
+ }
+
@Test
void queryByWorkflowCodeVersionStatus_EXIST_FINISH_INSTANCE() {
long workflowDefinitionCode = 1L;
diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceProcessorManager.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceProcessorManager.java
index 421d42dcf0..da7376098e 100644
--- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceProcessorManager.java
+++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/plugin/DataSourceProcessorManager.java
@@ -42,13 +42,11 @@ public class DataSourceProcessorManager {
ServiceLoader.load(DataSourceProcessor.class).forEach(factory -> {
final String name = factory.getDbType().name();
- log.info("start register processor: {}", name);
if (dataSourceProcessorMap.containsKey(name)) {
throw new IllegalStateException(format("Duplicate datasource plugins named '%s'", name));
}
loadDatasourceClient(factory);
-
- log.info("done register processor: {}", name);
+ log.info("Success register datasource plugin -> {}", name);
});
}
diff --git a/dolphinscheduler-eventbus/pom.xml b/dolphinscheduler-eventbus/pom.xml
new file mode 100644
index 0000000000..e615e5ab0e
--- /dev/null
+++ b/dolphinscheduler-eventbus/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ ~
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler</artifactId>
+ <version>dev-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dolphinscheduler-eventbus</artifactId>
+
+</project>
diff --git a/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEvent.java b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEvent.java
new file mode 100644
index 0000000000..bc57aef9e9
--- /dev/null
+++ b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEvent.java
@@ -0,0 +1,56 @@
+/*
+ * 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.eventbus;
+
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * The abstract class of delay event, the event will be triggered after the delay time.
+ * <p> You can extend this class to implement your own delay event.
+ */
+public abstract class AbstractDelayEvent implements IEvent, Delayed {
+
+ protected long delayTime;
+
+ protected long triggerTimeInMillis;
+
+ public AbstractDelayEvent() {
+ this(0);
+ }
+
+ public AbstractDelayEvent(long delayTime) {
+ if (delayTime == 0) {
+ this.triggerTimeInMillis = System.currentTimeMillis();
+ } else {
+ this.triggerTimeInMillis = System.currentTimeMillis() + delayTime;
+ }
+ }
+
+ @Override
+ public long getDelay(TimeUnit unit) {
+ long delay = triggerTimeInMillis - System.currentTimeMillis();
+ return unit.convert(delay, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public int compareTo(Delayed other) {
+ return Long.compare(this.triggerTimeInMillis, ((AbstractDelayEvent) other).triggerTimeInMillis);
+ }
+
+}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEventBus.java
similarity index 57%
copy from dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
copy to dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEventBus.java
index a080a6c826..4d3c259e45 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
+++ b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/AbstractDelayEventBus.java
@@ -15,42 +15,30 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.common.enums;
+package org.apache.dolphinscheduler.eventbus;
-import com.baomidou.mybatisplus.annotation.EnumValue;
+import java.util.Optional;
+import java.util.concurrent.DelayQueue;
/**
- * have_script
- * have_file
- * can_retry
- * have_arr_variables
- * have_map_variables
- * have_alert
- * is_cache
+ * The event bus that supports delay event.
*/
-public enum Flag {
+public abstract class AbstractDelayEventBus<T extends AbstractDelayEvent> implements IEventBus<T> {
- /**
- * 0 no
- * 1 yes
- */
- NO(0, "no"),
- YES(1, "yes");
+ protected final DelayQueue<T> delayEventQueue = new DelayQueue<>();
- Flag(int code, String descp) {
- this.code = code;
- this.descp = descp;
+ @Override
+ public void publish(final T event) {
+ delayEventQueue.add(event);
}
- @EnumValue
- private final int code;
- private final String descp;
-
- public int getCode() {
- return code;
+ @Override
+ public Optional<T> poll() {
+ return Optional.ofNullable(delayEventQueue.poll());
}
- public String getDescp() {
- return descp;
+ @Override
+ public boolean isEmpty() {
+ return delayEventQueue.isEmpty();
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteResult.java b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEvent.java
similarity index 83%
rename from dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteResult.java
rename to dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEvent.java
index 52ae3c8d5f..f28f8f4fa4 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteResult.java
+++ b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEvent.java
@@ -15,8 +15,11 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.api.executor;
+package org.apache.dolphinscheduler.eventbus;
-public interface ExecuteResult {
+/**
+ * The interface of event which is used can be stored at {@link IEventBus}.
+ */
+public interface IEvent {
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunction.java b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEventBus.java
similarity index 57%
rename from dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunction.java
rename to dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEventBus.java
index 8945c0d678..8e3346e778 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/ExecuteFunction.java
+++ b/dolphinscheduler-eventbus/src/main/java/org/apache/dolphinscheduler/eventbus/IEventBus.java
@@ -1,3 +1,7 @@
+package org.apache.dolphinscheduler.eventbus;
+
+import java.util.Optional;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -15,23 +19,26 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.api.executor;
-
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
+/**
+ * The interface of event bus, which is used to publish and poll events.
+ *
+ * @param <T> event type
+ */
+public interface IEventBus<T extends IEvent> {
-public interface ExecuteFunction<Request extends ExecuteRequest, Result extends ExecuteResult> {
+ /**
+ * Publish an event to the bus.
+ */
+ void publish(T event);
/**
- * Execute the workflow by the given request.
- *
- * @param request execute request
- * @return execute result
- * @throws ExecuteRuntimeException If there is an exception during execution, it will be thrown.
+ * Remove the head event from the bus. This method will not block if the event bus is empty will return empty optional.
+ * <p> If the thread is interrupted, an {@link InterruptedException} will be thrown.
*/
- Result execute(Request request) throws ExecuteRuntimeException;
+ Optional<T> poll() throws InterruptedException;
/**
- * @return the type of the executor
+ * Whether the bus is empty.
*/
- ExecuteType getExecuteType();
+ boolean isEmpty();
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/JdkDynamicRpcClientProxyFactory.java b/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/JdkDynamicRpcClientProxyFactory.java
index bf329ab3fc..2d074115bd 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/JdkDynamicRpcClientProxyFactory.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/JdkDynamicRpcClientProxyFactory.java
@@ -25,25 +25,35 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
+import com.google.common.cache.RemovalListener;
/**
* This class is used to create a proxy client which will transform local method invocation to remove invocation.
*/
+@Slf4j
class JdkDynamicRpcClientProxyFactory implements IRpcClientProxyFactory {
private final NettyRemotingClient nettyRemotingClient;
private static final LoadingCache<String, Map<String, Object>> proxyClientCache = CacheBuilder.newBuilder()
- // expire here to remove dead host
+ // expire here to remove dead host which is never used
+ // It's safe to remove dead host here because the client will be recreated when needed
+ // and the client is only a proxy client, it will not hold any resource
.expireAfterAccess(Duration.ofHours(1))
+ .removalListener((RemovalListener<String, Map<String, Object>>) notification -> {
+ log.warn("Remove DynamicRpcClientProxy cache for host: {}", notification.getKey());
+ notification.getValue().clear();
+ })
.build(new CacheLoader<String, Map<String, Object>>() {
@Override
- public Map<String, Object> load(String key) {
+ public Map<String, Object> load(String host) {
+ log.info("Create DynamicRpcClientProxy cache for host: {}", host);
return new ConcurrentHashMap<>();
}
});
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactory.java b/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactory.java
index 44d310e70b..fc48d90c65 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactory.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-base/src/main/java/org/apache/dolphinscheduler/extract/base/client/SingletonJdkDynamicRpcClientProxyFactory.java
@@ -19,6 +19,10 @@ package org.apache.dolphinscheduler.extract.base.client;
import org.apache.dolphinscheduler.extract.base.config.NettyClientConfig;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class SingletonJdkDynamicRpcClientProxyFactory {
private static final JdkDynamicRpcClientProxyFactory INSTANCE = new JdkDynamicRpcClientProxyFactory(
@@ -28,4 +32,21 @@ public class SingletonJdkDynamicRpcClientProxyFactory {
return INSTANCE.getProxyClient(serverAddress, clazz);
}
+ public static <T> JdkDynamicRpcClientProxyBuilder<T> withService(Class<T> serviceClazz) {
+ return new JdkDynamicRpcClientProxyBuilder<>(serviceClazz);
+ }
+
+ public static class JdkDynamicRpcClientProxyBuilder<T> {
+
+ private final Class<T> serviceClazz;
+
+ public JdkDynamicRpcClientProxyBuilder(Class<T> serviceClazz) {
+ this.serviceClazz = serviceClazz;
+ }
+
+ public T withHost(String serviceHost) {
+ return getProxyClient(serviceHost, serviceClazz);
+ }
+ }
+
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskExecutionEventListener.java
similarity index 54%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskExecutionEventListener.java
index fefd8a0574..7ebd1310bd 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskExecutionEventListener.java
@@ -19,25 +19,32 @@ package org.apache.dolphinscheduler.extract.master;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionFinishEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionInfoEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionRunningEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStateChangeEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionDispatchEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionFailedEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionKilledEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionPausedEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionRunningEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskExecutionSuccessEvent;
@RpcService
-public interface ITaskInstanceExecutionEventListener {
+public interface ITaskExecutionEventListener {
@RpcMethod
- void onTaskInstanceExecutionRunning(TaskInstanceExecutionRunningEvent taskInstanceExecutionRunningEvent);
+ void onTaskInstanceDispatched(final TaskExecutionDispatchEvent taskExecutionDispatchEvent);
@RpcMethod
- void onTaskInstanceExecutionFinish(TaskInstanceExecutionFinishEvent taskInstanceExecutionFinishEvent);
+ void onTaskInstanceExecutionRunning(final TaskExecutionRunningEvent taskInstanceExecutionRunningEvent);
@RpcMethod
- void onTaskInstanceExecutionInfoUpdate(TaskInstanceExecutionInfoEvent taskInstanceExecutionInfoEvent);
+ void onTaskInstanceExecutionSuccess(final TaskExecutionSuccessEvent taskInstanceExecutionSuccessEvent);
- // todo: Split this into a separate interface
@RpcMethod
- void onWorkflowInstanceInstanceStateChange(WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent);
+ void onTaskInstanceExecutionFailed(final TaskExecutionFailedEvent taskInstanceExecutionFailedEvent);
+
+ @RpcMethod
+ void onTaskInstanceExecutionKilled(final TaskExecutionKilledEvent taskInstanceExecutionKilledEvent);
+
+ @RpcMethod
+ void onTaskInstanceExecutionPaused(final TaskExecutionPausedEvent taskInstanceExecutionPausedEvent);
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IStreamingTaskOperator.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceController.java
similarity index 66%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IStreamingTaskOperator.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceController.java
index f98e249fbd..8ba4501eae 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IStreamingTaskOperator.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceController.java
@@ -19,13 +19,16 @@ package org.apache.dolphinscheduler.extract.master;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
-import org.apache.dolphinscheduler.extract.master.transportor.StreamingTaskTriggerRequest;
-import org.apache.dolphinscheduler.extract.master.transportor.StreamingTaskTriggerResponse;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskGroupSlotAcquireSuccessNotifyRequest;
+import org.apache.dolphinscheduler.extract.master.transportor.TaskGroupSlotAcquireSuccessNotifyResponse;
+/**
+ * Task instance controller used to do control operation for task instance.
+ */
@RpcService
-public interface IStreamingTaskOperator {
+public interface ITaskInstanceController {
@RpcMethod
- StreamingTaskTriggerResponse triggerStreamingTask(StreamingTaskTriggerRequest streamingTaskTriggerRequest);
+ TaskGroupSlotAcquireSuccessNotifyResponse notifyTaskGroupSlotAcquireSuccess(TaskGroupSlotAcquireSuccessNotifyRequest taskGroupSlotAcquireSuccessNotifyRequest);
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceController.java
similarity index 54%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceController.java
index fefd8a0574..043efaa83c 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/ITaskInstanceExecutionEventListener.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceController.java
@@ -19,25 +19,21 @@ package org.apache.dolphinscheduler.extract.master;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionFinishEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionInfoEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceExecutionRunningEvent;
-import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStateChangeEvent;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstancePauseRequest;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstancePauseResponse;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStopRequest;
+import org.apache.dolphinscheduler.extract.master.transportor.WorkflowInstanceStopResponse;
+/**
+ * Workflow instance controller used to do control operation for workflow instance.
+ */
@RpcService
-public interface ITaskInstanceExecutionEventListener {
-
- @RpcMethod
- void onTaskInstanceExecutionRunning(TaskInstanceExecutionRunningEvent taskInstanceExecutionRunningEvent);
-
- @RpcMethod
- void onTaskInstanceExecutionFinish(TaskInstanceExecutionFinishEvent taskInstanceExecutionFinishEvent);
+public interface IWorkflowInstanceController {
@RpcMethod
- void onTaskInstanceExecutionInfoUpdate(TaskInstanceExecutionInfoEvent taskInstanceExecutionInfoEvent);
+ WorkflowInstancePauseResponse pauseWorkflowInstance(WorkflowInstancePauseRequest workflowInstancePauseRequest);
- // todo: Split this into a separate interface
@RpcMethod
- void onWorkflowInstanceInstanceStateChange(WorkflowInstanceStateChangeEvent workflowInstanceStateChangeEvent);
+ WorkflowInstanceStopResponse stopWorkflowInstance(WorkflowInstanceStopRequest workflowInstanceStopRequest);
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceService.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceService.java
index a535f8c6ca..2201003233 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceService.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/IWorkflowInstanceService.java
@@ -19,9 +19,6 @@ package org.apache.dolphinscheduler.extract.master;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
-import org.apache.dolphinscheduler.extract.master.dto.WorkflowExecuteDto;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceWakeupRequest;
-import org.apache.dolphinscheduler.extract.master.transportor.TaskInstanceWakeupResponse;
@RpcService
public interface IWorkflowInstanceService {
@@ -29,10 +26,4 @@ public interface IWorkflowInstanceService {
@RpcMethod
void clearWorkflowMetrics(Long workflowDefinitionCode);
- @RpcMethod
- WorkflowExecuteDto getWorkflowExecutingData(Integer workflowInstanceId);
-
- @RpcMethod
- TaskInstanceWakeupResponse wakeupTaskInstance(TaskInstanceWakeupRequest taskWakeupRequest);
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/AbstractCommandParam.java
similarity index 66%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/AbstractCommandParam.java
index ddca440436..42ee634f57 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/AbstractCommandParam.java
@@ -15,23 +15,27 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.master.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
-import java.io.Serializable;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+
+import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
-@Builder
+@SuperBuilder(toBuilder = true)
@NoArgsConstructor
-@AllArgsConstructor
-public class TaskInstanceWakeupRequest implements Serializable {
+public abstract class AbstractCommandParam implements ICommandParam {
+
+ protected boolean subWorkflowInstance;
+
+ protected List<Long> startNodes;
- private int processInstanceId;
+ protected List<Property> commandParams;
- private int taskInstanceId;
+ protected String timeZone;
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/BackfillWorkflowCommandParam.java
similarity index 63%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/BackfillWorkflowCommandParam.java
index 1d8884f7fe..b5ab07c217 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/BackfillWorkflowCommandParam.java
@@ -15,27 +15,27 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.master.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
+
+import org.apache.dolphinscheduler.common.enums.CommandType;
+
+import java.util.List;
-import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
@NoArgsConstructor
-@AllArgsConstructor
-public class TaskInstanceWakeupResponse {
-
- private boolean success;
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class BackfillWorkflowCommandParam extends AbstractCommandParam {
- private String message;
+ private List<String> backfillTimeList;
- public static TaskInstanceWakeupResponse success() {
- return new TaskInstanceWakeupResponse(true, null);
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.COMPLEMENT_DATA;
}
-
- public static TaskInstanceWakeupResponse failed(String message) {
- return new TaskInstanceWakeupResponse(false, message);
- }
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ICommandParam.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ICommandParam.java
new file mode 100644
index 0000000000..17ac808e45
--- /dev/null
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ICommandParam.java
@@ -0,0 +1,65 @@
+/*
+ * 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.extract.master.command;
+
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, visible = true, property = "commandType")
+@JsonSubTypes({
+ @JsonSubTypes.Type(value = ScheduleWorkflowCommandParam.class, name = "SCHEDULER"),
+ @JsonSubTypes.Type(value = RunWorkflowCommandParam.class, name = "START_PROCESS"),
+ @JsonSubTypes.Type(value = BackfillWorkflowCommandParam.class, name = "COMPLEMENT_DATA"),
+ @JsonSubTypes.Type(value = ReRunWorkflowCommandParam.class, name = "REPEAT_RUNNING"),
+ @JsonSubTypes.Type(value = RecoverFailureTaskCommandParam.class, name = "START_FAILURE_TASK_PROCESS"),
+ @JsonSubTypes.Type(value = WorkflowFailoverCommandParam.class, name = "RECOVER_TOLERANCE_FAULT"),
+})
+public interface ICommandParam {
+
+ /**
+ * The task which need to be as the beginning of the workflow.
+ */
+ List<Long> getStartNodes();
+
+ /**
+ * The command params.
+ */
+ List<Property> getCommandParams();
+
+ /**
+ * Get the time zone.
+ * todo: we should remove this field.
+ */
+ String getTimeZone();
+
+ /**
+ * Whether the command is used to trigger a sub workflow instance.
+ */
+ boolean isSubWorkflowInstance();
+
+ /**
+ * Get the command type.
+ */
+ CommandType getCommandType();
+
+}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ReRunWorkflowCommandParam.java
similarity index 65%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ReRunWorkflowCommandParam.java
index f73ac59cc9..08916928af 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ReRunWorkflowCommandParam.java
@@ -15,26 +15,25 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.worker.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
+
+import org.apache.dolphinscheduler.common.enums.CommandType;
-import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
@NoArgsConstructor
-@AllArgsConstructor
-public class UpdateWorkflowHostResponse {
-
- private boolean success;
- private String message;
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class ReRunWorkflowCommandParam extends AbstractCommandParam {
- public static UpdateWorkflowHostResponse success() {
- return new UpdateWorkflowHostResponse(true, null);
- }
+ private Integer workflowInstanceId;
- public static UpdateWorkflowHostResponse failed(String message) {
- return new UpdateWorkflowHostResponse(false, message);
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.REPEAT_RUNNING;
}
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RecoverFailureTaskCommandParam.java
similarity index 66%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RecoverFailureTaskCommandParam.java
index ddca440436..b7ab5f2fa9 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RecoverFailureTaskCommandParam.java
@@ -15,23 +15,23 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.master.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
-import java.io.Serializable;
+import org.apache.dolphinscheduler.common.enums.CommandType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
-@Builder
@NoArgsConstructor
-@AllArgsConstructor
-public class TaskInstanceWakeupRequest implements Serializable {
-
- private int processInstanceId;
-
- private int taskInstanceId;
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class RecoverFailureTaskCommandParam extends AbstractCommandParam {
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.START_FAILURE_TASK_PROCESS;
+ }
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RunWorkflowCommandParam.java
similarity index 67%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RunWorkflowCommandParam.java
index ddca440436..960a4f7177 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/RunWorkflowCommandParam.java
@@ -15,23 +15,24 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.master.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
-import java.io.Serializable;
+import org.apache.dolphinscheduler.common.enums.CommandType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
-@Builder
@NoArgsConstructor
-@AllArgsConstructor
-public class TaskInstanceWakeupRequest implements Serializable {
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class RunWorkflowCommandParam extends AbstractCommandParam {
- private int processInstanceId;
-
- private int taskInstanceId;
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.START_PROCESS;
+ }
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ScheduleWorkflowCommandParam.java
similarity index 66%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ScheduleWorkflowCommandParam.java
index ddca440436..604d711381 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/ScheduleWorkflowCommandParam.java
@@ -15,23 +15,24 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.extract.master.transportor;
+package org.apache.dolphinscheduler.extract.master.command;
-import java.io.Serializable;
+import org.apache.dolphinscheduler.common.enums.CommandType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
@Data
-@Builder
@NoArgsConstructor
-@AllArgsConstructor
-public class TaskInstanceWakeupRequest implements Serializable {
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class ScheduleWorkflowCommandParam extends AbstractCommandParam {
- private int processInstanceId;
-
- private int taskInstanceId;
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.SCHEDULER;
+ }
}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/WorkflowFailoverCommandParam.java
similarity index 60%
rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/WorkflowFailoverCommandParam.java
index 42f428ad75..eb047b1f90 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStateEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/command/WorkflowFailoverCommandParam.java
@@ -15,39 +15,29 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.event;
+package org.apache.dolphinscheduler.extract.master.command;
-import org.apache.dolphinscheduler.common.enums.StateEventType;
+import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import io.netty.channel.Channel;
+import lombok.experimental.SuperBuilder;
@Data
-@Builder
-@AllArgsConstructor
@NoArgsConstructor
-public class WorkflowStateEvent implements StateEvent {
-
- // todo: use wrapper type
- private int processInstanceId;
+@SuperBuilder(toBuilder = true)
+@EqualsAndHashCode(callSuper = true)
+public class WorkflowFailoverCommandParam extends AbstractCommandParam {
/**
- * Some event may contains taskInstanceId
+ * The workflow instance state before failover, we need to set the workflow instance state to this value after recover.
*/
- private Integer taskInstanceId;
-
- private WorkflowExecutionStatus status;
-
- private @NonNull StateEventType type;
-
- private String key;
-
- private Channel channel;
+ private WorkflowExecutionStatus workflowExecutionStatus;
- private String context;
+ @Override
+ public CommandType getCommandType() {
+ return CommandType.RECOVER_TOLERANCE_FAULT_PROCESS;
+ }
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskInstanceExecutionEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskExecutionEvent.java
similarity index 82%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskInstanceExecutionEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskExecutionEvent.java
index 25b7b7e727..a1df0829a5 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskInstanceExecutionEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/ITaskExecutionEvent.java
@@ -17,7 +17,12 @@
package org.apache.dolphinscheduler.extract.master.transportor;
-public interface ITaskInstanceExecutionEvent {
+// todo: add event source to distinguish the event is from executor or user operation
+public interface ITaskExecutionEvent {
+
+ int getWorkflowInstanceId();
+
+ int getTaskInstanceId();
long getEventCreateTime();
@@ -38,9 +43,12 @@ public interface ITaskInstanceExecutionEvent {
TaskInstanceExecutionEventType getEventType();
enum TaskInstanceExecutionEventType {
+ DISPATCH,
RUNNING,
- FINISH,
- RUNNING_INFO
+ PAUSED,
+ KILLED,
+ FAILED,
+ SUCCESS,
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionDispatchEvent.java
similarity index 82%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionDispatchEvent.java
index 1623e03e92..91838a5808 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionDispatchEvent.java
@@ -18,27 +18,23 @@
package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@AllArgsConstructor
+@Builder
@NoArgsConstructor
-public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEvent {
+@AllArgsConstructor
+public class TaskExecutionDispatchEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
-
- private long startTime;
-
- private String workflowInstanceHost;
+ private int workflowInstanceId;
private String taskInstanceHost;
- private String logPath;
-
- private int processId;
+ private String workflowInstanceHost;
private long eventCreateTime;
@@ -46,6 +42,6 @@ public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEve
@Override
public TaskInstanceExecutionEventType getEventType() {
- return TaskInstanceExecutionEventType.RUNNING_INFO;
+ return TaskInstanceExecutionEventType.DISPATCH;
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionFailedEvent.java
similarity index 82%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionFailedEvent.java
index 1623e03e92..c1c460acd6 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionFailedEvent.java
@@ -18,27 +18,27 @@
package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@AllArgsConstructor
+@Builder
@NoArgsConstructor
-public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEvent {
+@AllArgsConstructor
+public class TaskExecutionFailedEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
+ private int workflowInstanceId;
- private long startTime;
+ private String taskInstanceHost;
private String workflowInstanceHost;
- private String taskInstanceHost;
-
- private String logPath;
+ private String appIds;
- private int processId;
+ private long endTime;
private long eventCreateTime;
@@ -46,6 +46,6 @@ public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEve
@Override
public TaskInstanceExecutionEventType getEventType() {
- return TaskInstanceExecutionEventType.RUNNING_INFO;
+ return TaskInstanceExecutionEventType.FAILED;
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionKilledEvent.java
similarity index 82%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionKilledEvent.java
index 1623e03e92..527f019c75 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionKilledEvent.java
@@ -18,27 +18,25 @@
package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@AllArgsConstructor
+@Builder
@NoArgsConstructor
-public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEvent {
+@AllArgsConstructor
+public class TaskExecutionKilledEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
-
- private long startTime;
-
- private String workflowInstanceHost;
+ private int workflowInstanceId;
private String taskInstanceHost;
- private String logPath;
+ private String workflowInstanceHost;
- private int processId;
+ private long endTime;
private long eventCreateTime;
@@ -46,6 +44,6 @@ public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEve
@Override
public TaskInstanceExecutionEventType getEventType() {
- return TaskInstanceExecutionEventType.RUNNING_INFO;
+ return TaskInstanceExecutionEventType.KILLED;
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionPausedEvent.java
similarity index 82%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionPausedEvent.java
index 1623e03e92..6186d0b762 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionInfoEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionPausedEvent.java
@@ -18,27 +18,25 @@
package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@AllArgsConstructor
+@Builder
@NoArgsConstructor
-public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEvent {
+@AllArgsConstructor
+public class TaskExecutionPausedEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
-
- private long startTime;
-
- private String workflowInstanceHost;
+ private int workflowInstanceId;
private String taskInstanceHost;
- private String logPath;
+ private String workflowInstanceHost;
- private int processId;
+ private long endTime;
private long eventCreateTime;
@@ -46,6 +44,6 @@ public class TaskInstanceExecutionInfoEvent implements ITaskInstanceExecutionEve
@Override
public TaskInstanceExecutionEventType getEventType() {
- return TaskInstanceExecutionEventType.RUNNING_INFO;
+ return TaskInstanceExecutionEventType.PAUSED;
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionRunningEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionRunningEvent.java
similarity index 92%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionRunningEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionRunningEvent.java
index 4c48a0a381..b99d8ea28a 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionRunningEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionRunningEvent.java
@@ -26,11 +26,11 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionRunningEvent implements ITaskInstanceExecutionEvent {
+public class TaskExecutionRunningEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
+ private int workflowInstanceId;
private long startTime;
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionFinishEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionSuccessEvent.java
similarity index 82%
rename from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionFinishEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionSuccessEvent.java
index 469412c66e..a7dd1c8909 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceExecutionFinishEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskExecutionSuccessEvent.java
@@ -18,30 +18,24 @@
package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
+@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionFinishEvent implements ITaskInstanceExecutionEvent {
+public class TaskExecutionSuccessEvent implements ITaskExecutionEvent {
private int taskInstanceId;
- private int processInstanceId;
-
- private int status;
-
- private long startTime;
+ private int workflowInstanceId;
private String taskInstanceHost;
private String workflowInstanceHost;
- private String logPath;
-
- private String executePath;
-
private long endTime;
private int processId;
@@ -56,6 +50,6 @@ public class TaskInstanceExecutionFinishEvent implements ITaskInstanceExecutionE
@Override
public TaskInstanceExecutionEventType getEventType() {
- return TaskInstanceExecutionEventType.FINISH;
+ return TaskInstanceExecutionEventType.SUCCESS;
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyRequest.java
similarity index 86%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyRequest.java
index ddca440436..c20c82b466 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyRequest.java
@@ -17,8 +17,6 @@
package org.apache.dolphinscheduler.extract.master.transportor;
-import java.io.Serializable;
-
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -28,10 +26,10 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceWakeupRequest implements Serializable {
+public class TaskGroupSlotAcquireSuccessNotifyRequest {
- private int processInstanceId;
+ private Integer workflowInstanceId;
- private int taskInstanceId;
+ private Integer taskInstanceId;
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyResponse.java
similarity index 74%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyResponse.java
index 1d8884f7fe..e3b964c8b9 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskGroupSlotAcquireSuccessNotifyResponse.java
@@ -24,18 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceWakeupResponse {
+public class TaskGroupSlotAcquireSuccessNotifyResponse {
private boolean success;
private String message;
- public static TaskInstanceWakeupResponse success() {
- return new TaskInstanceWakeupResponse(true, null);
+ public static TaskGroupSlotAcquireSuccessNotifyResponse success() {
+ return new TaskGroupSlotAcquireSuccessNotifyResponse(true, null);
}
- public static TaskInstanceWakeupResponse failed(String message) {
- return new TaskInstanceWakeupResponse(false, message);
+ public static TaskGroupSlotAcquireSuccessNotifyResponse failed(String message) {
+ return new TaskGroupSlotAcquireSuccessNotifyResponse(false, message);
}
-
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningResult.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseRequest.java
similarity index 79%
rename from dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningResult.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseRequest.java
index 9fa7ed0004..1ddd34c113 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/instance/rerun/RepeatRunningResult.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseRequest.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.api.executor.workflow.instance.rerun;
-
-import org.apache.dolphinscheduler.api.executor.ExecuteResult;
+package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@NoArgsConstructor
@AllArgsConstructor
-public class RepeatRunningResult implements ExecuteResult {
+public class WorkflowInstancePauseRequest {
- private final Integer commandId;
+ private Integer workflowInstanceId;
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseResponse.java
similarity index 77%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseResponse.java
index 1d8884f7fe..7b2eb86802 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstancePauseResponse.java
@@ -22,20 +22,18 @@ import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceWakeupResponse {
+@NoArgsConstructor
+public class WorkflowInstancePauseResponse {
private boolean success;
-
private String message;
- public static TaskInstanceWakeupResponse success() {
- return new TaskInstanceWakeupResponse(true, null);
+ public static WorkflowInstancePauseResponse success() {
+ return new WorkflowInstancePauseResponse(true, null);
}
- public static TaskInstanceWakeupResponse failed(String message) {
- return new TaskInstanceWakeupResponse(false, message);
+ public static WorkflowInstancePauseResponse fail(String message) {
+ return new WorkflowInstancePauseResponse(false, message);
}
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStateChangeEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStateChangeEvent.java
deleted file mode 100644
index 9064b94fae..0000000000
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStateChangeEvent.java
+++ /dev/null
@@ -1,60 +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.extract.master.transportor;
-
-import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class WorkflowInstanceStateChangeEvent {
-
- private String key;
-
- private WorkflowExecutionStatus sourceStatus;
-
- private int sourceProcessInstanceId;
-
- private int sourceTaskInstanceId;
-
- private int destProcessInstanceId;
-
- private int destTaskInstanceId;
-
- public WorkflowInstanceStateChangeEvent(int sourceProcessInstanceId,
- int sourceTaskInstanceId,
- WorkflowExecutionStatus sourceStatus,
- int destProcessInstanceId,
- int destTaskInstanceId) {
- this.key = String.format("%d-%d-%d-%d",
- sourceProcessInstanceId,
- sourceTaskInstanceId,
- destProcessInstanceId,
- destTaskInstanceId);
-
- this.sourceStatus = sourceStatus;
- this.sourceProcessInstanceId = sourceProcessInstanceId;
- this.sourceTaskInstanceId = sourceTaskInstanceId;
- this.destProcessInstanceId = destProcessInstanceId;
- this.destTaskInstanceId = destTaskInstanceId;
- }
-}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEvent.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopRequest.java
similarity index 81%
rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEvent.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopRequest.java
index 5d5bc2eb32..f7ad1a38b9 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowEvent.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopRequest.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.event;
+package org.apache.dolphinscheduler.extract.master.transportor;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
-public class WorkflowEvent {
+@NoArgsConstructor
+public class WorkflowInstanceStopRequest {
- private WorkflowEventType workflowEventType;
-
- private int workflowInstanceId;
+ private Integer workflowInstanceId;
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopResponse.java
similarity index 78%
copy from dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopResponse.java
index 1d8884f7fe..22ae5b6891 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/TaskInstanceWakeupResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/WorkflowInstanceStopResponse.java
@@ -22,20 +22,18 @@ import lombok.Data;
import lombok.NoArgsConstructor;
@Data
-@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceWakeupResponse {
+@NoArgsConstructor
+public class WorkflowInstanceStopResponse {
private boolean success;
-
private String message;
- public static TaskInstanceWakeupResponse success() {
- return new TaskInstanceWakeupResponse(true, null);
+ public static WorkflowInstanceStopResponse success() {
+ return new WorkflowInstanceStopResponse(true, null);
}
- public static TaskInstanceWakeupResponse failed(String message) {
- return new TaskInstanceWakeupResponse(false, message);
+ public static WorkflowInstanceStopResponse fail(String message) {
+ return new WorkflowInstanceStopResponse(false, message);
}
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceExecutionEventAckListener.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceExecutionEventAckListener.java
index 940d2e2dd1..fda644110f 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceExecutionEventAckListener.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceExecutionEventAckListener.java
@@ -19,21 +19,33 @@ package org.apache.dolphinscheduler.extract.worker;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
-import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceExecutionFinishEventAck;
-import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceExecutionInfoEventAck;
+import org.apache.dolphinscheduler.extract.worker.transportor.TaskExecutionFailedEventAck;
+import org.apache.dolphinscheduler.extract.worker.transportor.TaskExecutionKilledEventAck;
+import org.apache.dolphinscheduler.extract.worker.transportor.TaskExecutionPausedEventAck;
+import org.apache.dolphinscheduler.extract.worker.transportor.TaskExecutionSuccessEventAck;
+import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceExecutionDispatchedEventAck;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceExecutionRunningEventAck;
@RpcService
public interface ITaskInstanceExecutionEventAckListener {
+ @RpcMethod
+ void handleTaskInstanceDispatchedEventAck(final TaskInstanceExecutionDispatchedEventAck taskInstanceExecutionDispatchedEventAck);
+
// todo: If we use sync, then we don't need ack here
@RpcMethod
void handleTaskInstanceExecutionRunningEventAck(TaskInstanceExecutionRunningEventAck taskInstanceExecutionRunningEventAck);
@RpcMethod
- void handleTaskInstanceExecutionFinishEventAck(TaskInstanceExecutionFinishEventAck taskInstanceExecutionFinishEventAck);
+ void handleTaskExecutionSuccessEventAck(TaskExecutionSuccessEventAck taskExecutionSuccessEventAck);
+
+ @RpcMethod
+ void handleTaskExecutionPausedEventAck(TaskExecutionPausedEventAck taskExecutionPausedEventAck);
+
+ @RpcMethod
+ void handleTaskExecutionFailedEventAck(TaskExecutionFailedEventAck taskExecutionFailedEventAck);
@RpcMethod
- void handleTaskInstanceExecutionInfoEventAck(TaskInstanceExecutionInfoEventAck taskInstanceExecutionInfoEventAck);
+ void handleTaskExecutionKilledEventAck(TaskExecutionKilledEventAck taskExecutionKilledEventAck);
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceOperator.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceOperator.java
index ca80afa8a2..43d6a39b01 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceOperator.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/ITaskInstanceOperator.java
@@ -19,28 +19,28 @@ package org.apache.dolphinscheduler.extract.worker;
import org.apache.dolphinscheduler.extract.base.RpcMethod;
import org.apache.dolphinscheduler.extract.base.RpcService;
+import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskRequest;
+import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskResponse;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceDispatchRequest;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceDispatchResponse;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceKillRequest;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstanceKillResponse;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstancePauseRequest;
import org.apache.dolphinscheduler.extract.worker.transportor.TaskInstancePauseResponse;
-import org.apache.dolphinscheduler.extract.worker.transportor.UpdateWorkflowHostRequest;
-import org.apache.dolphinscheduler.extract.worker.transportor.UpdateWorkflowHostResponse;
@RpcService
public interface ITaskInstanceOperator {
@RpcMethod
- TaskInstanceDispatchResponse dispatchTask(TaskInstanceDispatchRequest taskInstanceDispatchRequest);
+ TaskInstanceDispatchResponse dispatchTask(final TaskInstanceDispatchRequest taskInstanceDispatchRequest);
@RpcMethod
- TaskInstanceKillResponse killTask(TaskInstanceKillRequest taskInstanceKillRequest);
+ TaskInstanceKillResponse killTask(final TaskInstanceKillRequest taskInstanceKillRequest);
@RpcMethod
- TaskInstancePauseResponse pauseTask(TaskInstancePauseRequest taskPauseRequest);
+ TaskInstancePauseResponse pauseTask(final TaskInstancePauseRequest taskPauseRequest);
@RpcMethod
- UpdateWorkflowHostResponse updateWorkflowInstanceHost(UpdateWorkflowHostRequest updateWorkflowHostRequest);
+ TakeOverTaskResponse takeOverTask(final TakeOverTaskRequest takeOverTaskRequest);
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostRequest.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskRequest.java
similarity index 94%
rename from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostRequest.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskRequest.java
index a8a02c7d14..d28a4d9a3e 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostRequest.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskRequest.java
@@ -18,13 +18,15 @@
package org.apache.dolphinscheduler.extract.worker.transportor;
import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
+@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class UpdateWorkflowHostRequest {
+public class TakeOverTaskRequest {
private int taskInstanceId;
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskResponse.java
similarity index 78%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskResponse.java
index f73ac59cc9..3b6b7696e3 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/UpdateWorkflowHostResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TakeOverTaskResponse.java
@@ -24,17 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class UpdateWorkflowHostResponse {
+public class TakeOverTaskResponse {
private boolean success;
private String message;
- public static UpdateWorkflowHostResponse success() {
- return new UpdateWorkflowHostResponse(true, null);
+ public static TakeOverTaskResponse success() {
+ return new TakeOverTaskResponse(true, null);
}
- public static UpdateWorkflowHostResponse failed(String message) {
- return new UpdateWorkflowHostResponse(false, message);
+ public static TakeOverTaskResponse failed(String message) {
+ return new TakeOverTaskResponse(false, message);
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionFailedEventAck.java
similarity index 74%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionFailedEventAck.java
index 31b080da40..3c02bbe461 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionFailedEventAck.java
@@ -24,17 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionInfoEventAck {
+public class TaskExecutionFailedEventAck {
- private boolean success;
private int taskInstanceId;
+ private boolean success;
- public static TaskInstanceExecutionInfoEventAck success(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(true, taskInstanceId);
+ public static TaskExecutionFailedEventAck success(int taskInstanceId) {
+ return new TaskExecutionFailedEventAck(taskInstanceId, true);
}
- public static TaskInstanceExecutionInfoEventAck fail(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(false, taskInstanceId);
+ public static TaskExecutionFailedEventAck failed(int taskInstanceId) {
+ return new TaskExecutionFailedEventAck(taskInstanceId, false);
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionKilledEventAck.java
similarity index 74%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionKilledEventAck.java
index 31b080da40..38b6441c1f 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionKilledEventAck.java
@@ -24,17 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionInfoEventAck {
+public class TaskExecutionKilledEventAck {
- private boolean success;
private int taskInstanceId;
+ private boolean success;
- public static TaskInstanceExecutionInfoEventAck success(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(true, taskInstanceId);
+ public static TaskExecutionKilledEventAck success(int taskInstanceId) {
+ return new TaskExecutionKilledEventAck(taskInstanceId, true);
}
- public static TaskInstanceExecutionInfoEventAck fail(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(false, taskInstanceId);
+ public static TaskExecutionKilledEventAck failed(int taskInstanceId) {
+ return new TaskExecutionKilledEventAck(taskInstanceId, false);
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionPausedEventAck.java
similarity index 74%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionPausedEventAck.java
index 31b080da40..fee22e9431 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionPausedEventAck.java
@@ -24,17 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionInfoEventAck {
+public class TaskExecutionPausedEventAck {
- private boolean success;
private int taskInstanceId;
+ private boolean success;
- public static TaskInstanceExecutionInfoEventAck success(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(true, taskInstanceId);
+ public static TaskExecutionPausedEventAck success(int taskInstanceId) {
+ return new TaskExecutionPausedEventAck(taskInstanceId, true);
}
- public static TaskInstanceExecutionInfoEventAck fail(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(false, taskInstanceId);
+ public static TaskExecutionPausedEventAck failed(int taskInstanceId) {
+ return new TaskExecutionPausedEventAck(taskInstanceId, false);
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionSuccessEventAck.java
similarity index 74%
copy from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
copy to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionSuccessEventAck.java
index 31b080da40..bcaba1d4fd 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskExecutionSuccessEventAck.java
@@ -24,17 +24,17 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionInfoEventAck {
+public class TaskExecutionSuccessEventAck {
- private boolean success;
private int taskInstanceId;
+ private boolean success;
- public static TaskInstanceExecutionInfoEventAck success(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(true, taskInstanceId);
+ public static TaskExecutionSuccessEventAck success(int taskInstanceId) {
+ return new TaskExecutionSuccessEventAck(taskInstanceId, true);
}
- public static TaskInstanceExecutionInfoEventAck fail(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(false, taskInstanceId);
+ public static TaskExecutionSuccessEventAck failed(int taskInstanceId) {
+ return new TaskExecutionSuccessEventAck(taskInstanceId, false);
}
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionDispatchedEventAck.java
similarity index 73%
rename from dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
rename to dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionDispatchedEventAck.java
index 31b080da40..088058284a 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionInfoEventAck.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceExecutionDispatchedEventAck.java
@@ -24,17 +24,16 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class TaskInstanceExecutionInfoEventAck {
+public class TaskInstanceExecutionDispatchedEventAck {
- private boolean success;
private int taskInstanceId;
+ private boolean success;
- public static TaskInstanceExecutionInfoEventAck success(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(true, taskInstanceId);
+ public static TaskInstanceExecutionDispatchedEventAck success(int taskInstanceId) {
+ return new TaskInstanceExecutionDispatchedEventAck(taskInstanceId, true);
}
- public static TaskInstanceExecutionInfoEventAck fail(int taskInstanceId) {
- return new TaskInstanceExecutionInfoEventAck(false, taskInstanceId);
+ public static TaskInstanceExecutionDispatchedEventAck failed(int taskInstanceId) {
+ return new TaskInstanceExecutionDispatchedEventAck(taskInstanceId, false);
}
-
}
diff --git a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceKillResponse.java b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceKillResponse.java
index 7ef3050ab7..2999a299bd 100644
--- a/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceKillResponse.java
+++ b/dolphinscheduler-extract/dolphinscheduler-extract-worker/src/main/java/org/apache/dolphinscheduler/extract/worker/transportor/TaskInstanceKillResponse.java
@@ -52,6 +52,7 @@ public class TaskInstanceKillResponse {
public static TaskInstanceKillResponse success(TaskExecutionContext taskExecutionContext) {
TaskInstanceKillResponse taskInstanceKillResponse = new TaskInstanceKillResponse();
+ taskInstanceKillResponse.setSuccess(true);
taskInstanceKillResponse.setStatus(taskExecutionContext.getCurrentExecutionStatus());
if (taskExecutionContext.getAppIds() != null) {
taskInstanceKillResponse
diff --git a/dolphinscheduler-master/pom.xml b/dolphinscheduler-master/pom.xml
index 1b99dd97f3..43aeb53a20 100644
--- a/dolphinscheduler-master/pom.xml
+++ b/dolphinscheduler-master/pom.xml
@@ -84,6 +84,12 @@
<artifactId>dolphinscheduler-extract-worker</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-eventbus</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
@@ -278,6 +284,19 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-worker</artifactId>
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 937231a924..975d2a07e6 100644
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -33,21 +33,22 @@ import org.apache.dolphinscheduler.registry.api.RegistryConfiguration;
import org.apache.dolphinscheduler.scheduler.api.SchedulerApi;
import org.apache.dolphinscheduler.server.master.cluster.ClusterManager;
import org.apache.dolphinscheduler.server.master.cluster.ClusterStateMonitors;
+import org.apache.dolphinscheduler.server.master.engine.WorkflowEngine;
+import org.apache.dolphinscheduler.server.master.engine.system.SystemEventBus;
+import org.apache.dolphinscheduler.server.master.engine.system.SystemEventBusFireWorker;
+import org.apache.dolphinscheduler.server.master.engine.system.event.GlobalMasterFailoverEvent;
import org.apache.dolphinscheduler.server.master.metrics.MasterServerMetrics;
import org.apache.dolphinscheduler.server.master.registry.MasterRegistryClient;
import org.apache.dolphinscheduler.server.master.rpc.MasterRpcServer;
-import org.apache.dolphinscheduler.server.master.runner.EventExecuteService;
-import org.apache.dolphinscheduler.server.master.runner.FailoverExecuteThread;
-import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerBootstrap;
-import org.apache.dolphinscheduler.server.master.runner.taskgroup.TaskGroupCoordinator;
import org.apache.dolphinscheduler.service.ServiceConfiguration;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import java.util.Date;
+
import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
-import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -69,32 +70,29 @@ public class MasterServer implements IStoppable {
private MasterRegistryClient masterRegistryClient;
@Autowired
- private MasterSchedulerBootstrap masterSchedulerBootstrap;
+ private WorkflowEngine workflowEngine;
@Autowired
private SchedulerApi schedulerApi;
- @Autowired
- private EventExecuteService eventExecuteService;
-
- @Autowired
- private FailoverExecuteThread failoverExecuteThread;
-
@Autowired
private MasterRpcServer masterRPCServer;
@Autowired
private MetricsProvider metricsProvider;
- @Autowired
- private TaskGroupCoordinator taskGroupCoordinator;
-
@Autowired
private ClusterStateMonitors clusterStateMonitors;
@Autowired
private ClusterManager clusterManager;
+ @Autowired
+ private SystemEventBus systemEventBus;
+
+ @Autowired
+ private SystemEventBusFireWorker systemEventBusFireWorker;
+
public static void main(String[] args) {
MasterServerMetrics.registerUncachedException(DefaultUncaughtExceptionHandler::getUncaughtExceptionCount);
@@ -107,7 +105,9 @@ public class MasterServer implements IStoppable {
* run master server
*/
@PostConstruct
- public void run() throws SchedulerException {
+ public void initialized() {
+ final long startupTime = System.currentTimeMillis();
+
// init rpc server
this.masterRPCServer.start();
@@ -122,13 +122,12 @@ public class MasterServer implements IStoppable {
this.clusterManager.start();
this.clusterStateMonitors.start();
- this.masterSchedulerBootstrap.start();
-
- this.eventExecuteService.start();
- this.failoverExecuteThread.start();
+ this.workflowEngine.start();
this.schedulerApi.start();
- this.taskGroupCoordinator.start();
+
+ this.systemEventBus.publish(GlobalMasterFailoverEvent.of(new Date(startupTime)));
+ this.systemEventBusFireWorker.start();
MasterServerMetrics.registerMasterCpuUsageGauge(() -> {
SystemMetrics systemMetrics = metricsProvider.getSystemMetrics();
@@ -148,6 +147,7 @@ public class MasterServer implements IStoppable {
close("MasterServer shutdownHook");
}
}));
+ log.info("MasterServer initialized successfully in {} ms", System.currentTimeMillis() - startupTime);
}
/**
@@ -165,8 +165,8 @@ public class MasterServer implements IStoppable {
// thread sleep 3 seconds for thread quietly stop
ThreadUtils.sleep(Constants.SERVER_CLOSE_WAIT_TIME.toMillis());
try (
+ WorkflowEngine workflowEngine1 = workflowEngine;
SchedulerApi closedSchedulerApi = schedulerApi;
- MasterSchedulerBootstrap closedSchedulerBootstrap = masterSchedulerBootstrap;
MasterRpcServer closedRpcServer = masterRPCServer;
MasterRegistryClient closedMasterRegistryClient = masterRegistryClient;
// close spring Context and will invoke method with @PreDestroy annotation to destroy beans.
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
deleted file mode 100644
index 1352d125c3..0000000000
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/ProcessInstanceExecCacheManager.java
+++ /dev/null
@@ -1,70 +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.server.master.cache;
-
-import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable;
-
-import java.util.Collection;
-
-import lombok.NonNull;
-
-/**
- * cache of process instance id and WorkflowExecuteThread
- */
-public interface ProcessInstanceExecCacheManager {
-
- /**
- * get WorkflowExecuteThread by process instance id
- *
- * @param processInstanceId processInstanceId
- * @return WorkflowExecuteThread
- */
- WorkflowExecuteRunnable getByProcessInstanceId(int processInstanceId);
-
- /**
- * judge the process instance does it exist
- *
- * @param processInstanceId processInstanceId
- * @return true - if process instance id exists in cache
- */
- boolean contains(int processInstanceId);
-
- /**
- * remove cache by process instance id
- *
- * @param processInstanceId processInstanceId
- */
- void removeByProcessInstanceId(int processInstanceId);
-
- /**
- * cache
- *
- * @param processInstanceId processInstanceId
- * @param workflowExecuteThread if it is null, will not be cached
- */
- void cache(int processInstanceId, @NonNull WorkflowExecuteRunnable workflowExecuteThread);
-
- /**
- * get all WorkflowExecuteThread from cache
- *
- * @return all WorkflowExecuteThread in cache
- */
- Collection<WorkflowExecuteRunnable> getAll();
-
- void clearCache();
-}
diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/StreamTaskInstanceExecCacheManager.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/StreamTaskInstanceExecCacheManager.java
deleted file mode 100644
index e4be3e8397..0000000000
--- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/cache/StreamTaskInstanceExecCacheManager.java
+++ /dev/null
@@ -1,51 +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.
- */
... 36612 lines suppressed ...