github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[Improvement-16574][Master] Move some task operations into ITaskExecutionRunnable (#16575)

dev
Wenjun Ruan 3 months ago committed by GitHub
parent
3a24d1777b
commit
0f4bce1883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 122 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java
  2. 3
      dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/workflow/WorkflowBackfillTriggerRequest.java
  3. 3
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/handler/TaskPauseLifecycleEventHandler.java
  4. 2
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/handler/TaskStartLifecycleEventHandler.java
  5. 41
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/runnable/ITaskExecutionRunnable.java
  6. 81
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/runnable/TaskExecutionRunnable.java
  7. 46
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/AbstractTaskStateAction.java
  8. 9
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/TaskFailureStateAction.java
  9. 1
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/listener/WorkflowSuccessLifecycleListener.java
  10. 12
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/runnable/WorkflowExecutionRunnable.java
  11. 11
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/statemachine/WorkflowRunningStateAction.java
  12. 2
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/trigger/WorkflowBackfillTrigger.java

1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java
Unescape View File

@ -122,7 +122,6 @@ public class BackfillWorkflowExecutorDelegate implements IExecutorDelegate<Backf
.startNodes(backfillWorkflowDTO.getStartNodes())
.failureStrategy(backfillWorkflowDTO.getFailureStrategy())
.taskDependType(backfillWorkflowDTO.getTaskDependType())
.execType(backfillWorkflowDTO.getExecType())
.warningType(backfillWorkflowDTO.getWarningType())
.warningGroupId(backfillWorkflowDTO.getWarningGroupId())
.workflowInstancePriority(backfillWorkflowDTO.getWorkflowInstancePriority())

3
dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/workflow/WorkflowBackfillTriggerRequest.java
Unescape View File

@ -17,7 +17,6 @@
package org.apache.dolphinscheduler.extract.master.transportor.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;
@ -55,8 +54,6 @@ public class WorkflowBackfillTriggerRequest {
@Builder.Default
private TaskDependType taskDependType = TaskDependType.TASK_POST;
private CommandType execType;
@Builder.Default
private WarningType warningType = WarningType.NONE;

3
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/handler/TaskPauseLifecycleEventHandler.java
Unescape View File

@ -34,9 +34,6 @@ public class TaskPauseLifecycleEventHandler extends AbstractTaskLifecycleEventHa
final IWorkflowExecutionRunnable workflowExecutionRunnable,
final ITaskExecutionRunnable taskExecutionRunnable,
final TaskPauseLifecycleEvent taskPauseEvent) {
if (!taskExecutionRunnable.isTaskInstanceInitialized()) {
taskExecutionRunnable.initializeTaskInstance();
}
taskStateAction.pauseEventAction(workflowExecutionRunnable, taskExecutionRunnable, taskPauseEvent);
}

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/lifecycle/handler/TaskStartLifecycleEventHandler.java
Unescape View File

@ -42,7 +42,7 @@ public class TaskStartLifecycleEventHandler extends AbstractTaskLifecycleEventHa
// So we need to initialize the task instance here.
// Otherwise, we cannot find the statemachine by task instance state.
if (!taskExecutionRunnable.isTaskInstanceInitialized()) {
taskExecutionRunnable.initializeTaskInstance();
taskExecutionRunnable.initializeFirstRunTaskInstance();
}
taskTimeoutMonitor(taskExecutionRunnable);
super.handle(workflowExecutionRunnable, taskStartLifecycleEvent);

41
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/runnable/ITaskExecutionRunnable.java
Unescape View File

@ -32,17 +32,48 @@ public interface ITaskExecutionRunnable
extends
Comparable<ITaskExecutionRunnable> {
String getName();
default String getName() {
return getTaskDefinition().getName();
}
/**
* Whether the task instance is initialized.
* <p> If the ITaskExecutionRunnable is never triggered, it is not initialized.
* <p> If the ITaskExecutionRunnable is created by failover, recovered then it is initialized.
*/
boolean isTaskInstanceInitialized();
void initializeTaskInstance();
/**
* Initialize the task instance with {@link FirstRunTaskInstanceFactory}
*/
void initializeFirstRunTaskInstance();
boolean isTaskInstanceNeedRetry();
/**
* Whether the task instance is running.
*/
boolean isTaskInstanceCanRetry();
void initializeRetryTaskInstance();
/**
* Retry the TaskExecutionRunnable.
* <p> Will create retry task instance and start it.
*/
void retry();
void initializeFailoverTaskInstance();
/**
* Failover the TaskExecutionRunnable.
* <p> The failover logic is judged by the task instance state.
*/
void failover();
/**
* Pause the TaskExecutionRunnable.
*/
void pause();
/**
* Kill the TaskExecutionRunnable.
*/
void kill();
WorkflowEventBus getWorkflowEventBus();

81
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/runnable/TaskExecutionRunnable.java
Unescape View File

@ -24,11 +24,22 @@ import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.extract.base.client.Clients;
import org.apache.dolphinscheduler.extract.worker.ITaskInstanceOperator;
import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskRequest;
import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskResponse;
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.utils.TaskTypeUtils;
import org.apache.dolphinscheduler.server.master.config.MasterConfig;
import org.apache.dolphinscheduler.server.master.engine.WorkflowEventBus;
import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
import org.apache.dolphinscheduler.server.master.engine.task.lifecycle.event.TaskKillLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.task.lifecycle.event.TaskPauseLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.task.lifecycle.event.TaskStartLifecycleEvent;
import org.apache.dolphinscheduler.server.master.runner.TaskExecutionContextFactory;
import org.apache.commons.lang3.StringUtils;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@ -62,24 +73,20 @@ public class TaskExecutionRunnable implements ITaskExecutionRunnable {
this.workflowInstance = checkNotNull(taskExecutionRunnableBuilder.getWorkflowInstance());
this.taskDefinition = checkNotNull(taskExecutionRunnableBuilder.getTaskDefinition());
this.taskInstance = taskExecutionRunnableBuilder.getTaskInstance();
if (taskInstance != null) {
if (isTaskInstanceInitialized()) {
initializeTaskExecutionContext();
}
}
@Override
public String getName() {
return taskDefinition.getName();
}
@Override
public boolean isTaskInstanceInitialized() {
return taskInstance != null;
}
@Override
public void initializeTaskInstance() {
checkState(taskInstance == null, "The task instance is not null, should not initialize again.");
public void initializeFirstRunTaskInstance() {
checkState(!isTaskInstanceInitialized(),
"The task instance is already initialized, can't initialize first run task.");
this.taskInstance = applicationContext.getBean(TaskInstanceFactories.class)
.firstRunTaskInstanceFactory()
.builder()
@ -90,35 +97,50 @@ public class TaskExecutionRunnable implements ITaskExecutionRunnable {
}
@Override
public boolean isTaskInstanceNeedRetry() {
public boolean isTaskInstanceCanRetry() {
return taskInstance.getRetryTimes() < taskInstance.getMaxRetryTimes();
}
@Override
public void initializeRetryTaskInstance() {
checkState(taskInstance != null, "The task instance can't retry, should not initialize retry task instance.");
public void retry() {
checkState(isTaskInstanceInitialized(), "The task instance is not initialized, can't initialize retry task.");
this.taskInstance = applicationContext.getBean(TaskInstanceFactories.class)
.retryTaskInstanceFactory()
.builder()
.withTaskInstance(taskInstance)
.build();
initializeTaskExecutionContext();
getWorkflowEventBus().publish(TaskStartLifecycleEvent.of(this));
}
@Override
public void initializeFailoverTaskInstance() {
checkState(taskInstance != null,
"The task instance can't failover, should not initialize failover task instance.");
public void failover() {
checkState(isTaskInstanceInitialized(), "The task instance is not initialized, can't failover.");
if (takeOverTaskFromExecutor()) {
log.info("Failover task success, the task {} has been taken-over from executor", taskInstance.getName());
return;
}
this.taskInstance = applicationContext.getBean(TaskInstanceFactories.class)
.failoverTaskInstanceFactory()
.builder()
.withTaskInstance(taskInstance)
.build();
initializeTaskExecutionContext();
getWorkflowEventBus().publish(TaskStartLifecycleEvent.of(this));
}
@Override
public void pause() {
getWorkflowEventBus().publish(TaskPauseLifecycleEvent.of(this));
}
@Override
public void kill() {
getWorkflowEventBus().publish(TaskKillLifecycleEvent.of(this));
}
private void initializeTaskExecutionContext() {
checkState(taskInstance != null, "The task instance is null, can't initialize TaskExecutionContext.");
checkState(isTaskInstanceInitialized(), "The task instance is null, can't initialize TaskExecutionContext.");
final TaskExecutionContextCreateRequest request = TaskExecutionContextCreateRequest.builder()
.workflowDefinition(workflowDefinition)
.workflowInstance(workflowInstance)
@ -129,6 +151,32 @@ public class TaskExecutionRunnable implements ITaskExecutionRunnable {
.createTaskExecutionContext(request);
}
private boolean takeOverTaskFromExecutor() {
checkState(isTaskInstanceInitialized(), "The task instance is null, can't take over from executor.");
if (TaskTypeUtils.isLogicTask(taskInstance.getTaskType())) {
return false;
}
if (StringUtils.isEmpty(taskInstance.getHost())) {
log.debug("Task: {} host is empty, cannot take over the task from executor(This is normal case).",
taskInstance.getName());
return false;
}
try {
final TakeOverTaskRequest takeOverTaskRequest = TakeOverTaskRequest.builder()
.taskInstanceId(taskInstance.getId())
.workflowHost(applicationContext.getBean(MasterConfig.class).getMasterAddress())
.build();
final TakeOverTaskResponse takeOverTaskResponse = Clients
.withService(ITaskInstanceOperator.class)
.withHost(taskInstance.getHost())
.takeOverTask(takeOverTaskRequest);
return takeOverTaskResponse.isSuccess();
} catch (Exception ex) {
log.warn("Take over task: {} failed", taskInstance.getName(), ex);
return false;
}
}
@Override
public int compareTo(ITaskExecutionRunnable other) {
if (other == null) {
@ -159,6 +207,9 @@ public class TaskExecutionRunnable implements ITaskExecutionRunnable {
@Override
public String toString() {
if (taskInstance != null) {
return "TaskExecutionRunnable{" + "name=" + getName() + ", state=" + taskInstance.getState() + '}';
}
return "TaskExecutionRunnable{" + "name=" + getName() + '}';
}
}

46
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/AbstractTaskStateAction.java
Unescape View File

@ -23,12 +23,7 @@ import static org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionSta
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
import org.apache.dolphinscheduler.extract.base.client.Clients;
import org.apache.dolphinscheduler.extract.worker.ITaskInstanceOperator;
import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskRequest;
import org.apache.dolphinscheduler.extract.worker.transportor.TakeOverTaskResponse;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.utils.TaskTypeUtils;
import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;
import org.apache.dolphinscheduler.server.master.config.MasterConfig;
import org.apache.dolphinscheduler.server.master.engine.AbstractLifecycleEvent;
@ -170,7 +165,7 @@ public abstract class AbstractTaskStateAction implements ITaskStateAction {
releaseTaskInstanceResourcesIfNeeded(taskExecutionRunnable);
persistentTaskInstanceFailedEventToDB(taskExecutionRunnable, taskFailedEvent);
if (taskExecutionRunnable.isTaskInstanceNeedRetry()) {
if (taskExecutionRunnable.isTaskInstanceCanRetry()) {
taskExecutionRunnable.getWorkflowEventBus().publish(TaskRetryLifecycleEvent.of(taskExecutionRunnable));
return;
}
@ -227,44 +222,7 @@ public abstract class AbstractTaskStateAction implements ITaskStateAction {
* <p> If the take-over fails, will generate a failover task-instance and mark the task instance status to {@link TaskExecutionStatus#NEED_FAULT_TOLERANCE}.
*/
protected void failoverTask(final ITaskExecutionRunnable taskExecutionRunnable) {
if (!taskExecutionRunnable.isTaskInstanceInitialized()) {
throw new IllegalStateException("The task instance hasn't been initialized, cannot take over the task");
}
if (takeOverTask(taskExecutionRunnable)) {
log.info("Failover task success, the task {} has been taken-over", taskExecutionRunnable.getName());
return;
}
taskExecutionRunnable.initializeFailoverTaskInstance();
tryToDispatchTask(taskExecutionRunnable);
log.info("Failover task success, the task {} has been resubmitted.", taskExecutionRunnable.getName());
}
private boolean takeOverTask(final ITaskExecutionRunnable taskExecutionRunnable) {
if (!taskExecutionRunnable.isTaskInstanceInitialized()) {
log.debug("Task: {} doesn't initialized yet, cannot take over the task", taskExecutionRunnable.getName());
return false;
}
if (TaskTypeUtils.isLogicTask(taskExecutionRunnable.getTaskInstance().getTaskType())) {
return false;
}
if (StringUtils.isEmpty(taskExecutionRunnable.getTaskInstance().getHost())) {
log.debug("Task: {} host is empty, cannot take over the task", taskExecutionRunnable.getName());
return false;
}
try {
final TakeOverTaskRequest takeOverTaskRequest = TakeOverTaskRequest.builder()
.taskInstanceId(taskExecutionRunnable.getTaskInstance().getId())
.workflowHost(masterConfig.getMasterAddress())
.build();
final TakeOverTaskResponse takeOverTaskResponse = Clients
.withService(ITaskInstanceOperator.class)
.withHost(taskExecutionRunnable.getTaskInstance().getHost())
.takeOverTask(takeOverTaskRequest);
return takeOverTaskResponse.isSuccess();
} catch (Exception ex) {
log.warn("Take over task: {} failed", taskExecutionRunnable.getName(), ex);
return false;
}
taskExecutionRunnable.failover();
}
protected void tryToDispatchTask(final ITaskExecutionRunnable taskExecutionRunnable) {

9
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/statemachine/TaskFailureStateAction.java
Unescape View File

@ -73,15 +73,14 @@ public class TaskFailureStateAction extends AbstractTaskStateAction {
throwExceptionIfStateIsNotMatch(taskExecutionRunnable);
final TaskInstance taskInstance = taskExecutionRunnable.getTaskInstance();
// check the retry times
if (!taskExecutionRunnable.isTaskInstanceNeedRetry()) {
if (!taskExecutionRunnable.isTaskInstanceCanRetry()) {
log.info("The task: {} cannot retry, because the retry times: {} is over the max retry times: {}",
taskInstance.getName(),
taskInstance.getRetryTimes(),
taskInstance.getMaxRetryTimes());
return;
}
taskExecutionRunnable.initializeRetryTaskInstance();
taskExecutionRunnable.getWorkflowEventBus().publish(TaskStartLifecycleEvent.of(taskExecutionRunnable));
taskExecutionRunnable.retry();
}
@Override
@ -117,7 +116,7 @@ public class TaskFailureStateAction extends AbstractTaskStateAction {
// This case happen when the task is failure but the task is in delay retry queue.
// We don't remove the event in GlobalWorkflowDelayEventCoordinator the event should be dropped when the task is
// killed.
if (taskExecutionRunnable.isTaskInstanceNeedRetry()
if (taskExecutionRunnable.isTaskInstanceCanRetry()
&& workflowExecutionGraph.isTaskExecutionRunnableActive(taskExecutionRunnable)) {
workflowExecutionGraph.markTaskExecutionRunnableChainPause(taskExecutionRunnable);
publishWorkflowInstanceTopologyLogicalTransitionEvent(taskExecutionRunnable);
@ -143,7 +142,7 @@ public class TaskFailureStateAction extends AbstractTaskStateAction {
// This case happen when the task is failure but the task is in delay retry queue.
// We don't remove the event in GlobalWorkflowDelayEventCoordinator the event should be dropped when the task is
// killed.
if (taskExecutionRunnable.isTaskInstanceNeedRetry()
if (taskExecutionRunnable.isTaskInstanceCanRetry()
&& workflowExecutionGraph.isTaskExecutionRunnableActive(taskExecutionRunnable)) {
workflowExecutionGraph.markTaskExecutionRunnableChainKill(taskExecutionRunnable);
publishWorkflowInstanceTopologyLogicalTransitionEvent(taskExecutionRunnable);

1
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/listener/WorkflowSuccessLifecycleListener.java
Unescape View File

@ -89,7 +89,6 @@ public class WorkflowSuccessLifecycleListener implements IWorkflowLifecycleListe
.startNodes(commandParam.getStartNodes())
.failureStrategy(workflowInstance.getFailureStrategy())
.taskDependType(workflowInstance.getTaskDependType())
.execType(CommandType.COMPLEMENT_DATA)
.warningType(workflowInstance.getWarningType())
.warningGroupId(workflowInstance.getWarningGroupId())
.workflowInstancePriority(workflowInstance.getProcessInstancePriority())

12
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/runnable/WorkflowExecutionRunnable.java
Unescape View File

@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.server.master.engine.workflow.runnable;
import static com.google.common.base.Preconditions.checkArgument;
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowPauseLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowStopLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.workflow.listener.IWorkflowLifecycleListener;
@ -29,8 +30,6 @@ import java.util.List;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.ApplicationContext;
@Slf4j
public class WorkflowExecutionRunnable implements IWorkflowExecutionRunnable {
@ -41,7 +40,6 @@ public class WorkflowExecutionRunnable implements IWorkflowExecutionRunnable {
private final List<IWorkflowLifecycleListener> workflowInstanceLifecycleListeners;
public WorkflowExecutionRunnable(WorkflowExecutionRunnableBuilder workflowExecutionRunnableBuilder) {
final ApplicationContext applicationContext = workflowExecutionRunnableBuilder.getApplicationContext();
this.workflowExecuteContext = workflowExecutionRunnableBuilder.getWorkflowExecuteContextBuilder().build();
this.workflowInstanceLifecycleListeners = workflowExecuteContext.getWorkflowInstanceLifecycleListeners();
}
@ -67,4 +65,12 @@ public class WorkflowExecutionRunnable implements IWorkflowExecutionRunnable {
workflowInstanceLifecycleListeners.add(listener);
}
@Override
public String toString() {
final WorkflowInstance workflowInstance = workflowExecuteContext.getWorkflowInstance();
return "WorkflowExecutionRunnable{" +
"name=" + workflowInstance.getName() +
", state=" + workflowInstance.getState().name() +
'}';
}
}

11
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/statemachine/WorkflowRunningStateAction.java
Unescape View File

@ -21,8 +21,7 @@ import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.utils.LogUtils;
import org.apache.dolphinscheduler.server.master.engine.WorkflowEventBus;
import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
import org.apache.dolphinscheduler.server.master.engine.task.lifecycle.event.TaskKillLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.task.lifecycle.event.TaskPauseLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowFailedLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowFinalizeLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowPauseLifecycleEvent;
@ -67,12 +66,10 @@ public class WorkflowRunningStateAction extends AbstractWorkflowStateAction {
super.transformWorkflowInstanceState(workflowExecutionRunnable, WorkflowExecutionStatus.READY_PAUSE);
try {
LogUtils.setWorkflowInstanceIdMDC(workflowExecutionRunnable.getId());
final WorkflowEventBus workflowEventBus = workflowExecutionRunnable.getWorkflowEventBus();
workflowExecutionRunnable
.getWorkflowExecutionGraph()
.getActiveTaskExecutionRunnable()
.forEach(taskExecutionRunnable -> workflowEventBus
.publish(TaskPauseLifecycleEvent.of(taskExecutionRunnable)));
.forEach(ITaskExecutionRunnable::pause);
} finally {
LogUtils.removeWorkflowInstanceIdMDC();
}
@ -93,12 +90,10 @@ public class WorkflowRunningStateAction extends AbstractWorkflowStateAction {
// do pause action
try {
LogUtils.setWorkflowInstanceIdMDC(workflowExecutionRunnable.getId());
final WorkflowEventBus workflowEventBus = workflowExecutionRunnable.getWorkflowEventBus();
workflowExecutionRunnable
.getWorkflowExecutionGraph()
.getActiveTaskExecutionRunnable()
.forEach(taskExecutionRunnable -> workflowEventBus
.publish(TaskKillLifecycleEvent.of(taskExecutionRunnable)));
.forEach(ITaskExecutionRunnable::kill);
} finally {
LogUtils.removeWorkflowInstanceIdMDC();
}

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/trigger/WorkflowBackfillTrigger.java
Unescape View File

@ -98,7 +98,7 @@ public class WorkflowBackfillTrigger
.backfillTimeList(backfillTriggerRequest.getBackfillTimeList())
.build();
return Command.builder()
.commandType(backfillTriggerRequest.getExecType())
.commandType(CommandType.COMPLEMENT_DATA)
.processDefinitionCode(backfillTriggerRequest.getWorkflowCode())
.processDefinitionVersion(backfillTriggerRequest.getWorkflowVersion())
.processInstanceId(workflowInstance.getId())

Write Preview
Loading…
Cancel
Save