Skip to content

Commit b8e3032

Browse files
authored
[Chore] Remove unused method in IWorkflowFailureStrategy (#18159)
1 parent 6434576 commit b8e3032

6 files changed

Lines changed: 36 additions & 35 deletions

File tree

‎dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/policy/ContinueWorkflowFailureStrategy.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,4 @@ public void onTaskFailure(IWorkflowExecutionRunnable workflowExecutionRunnable,
3232
// do nothing, just continue workflow execution
3333
}
3434

35-
@Override
36-
public boolean canTriggerSuccessor(IWorkflowExecutionRunnable workflowExecutionRunnable,
37-
ITaskExecutionRunnable taskExecutionRunnable) {
38-
return true;
39-
}
40-
4135
}

‎dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/policy/EndWorkflowFailureStrategy.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,4 @@ public void onTaskFailure(IWorkflowExecutionRunnable workflowExecutionRunnable,
3737
workflowExecutionRunnable.killActiveTasks();
3838
}
3939

40-
@Override
41-
public boolean canTriggerSuccessor(IWorkflowExecutionRunnable workflowExecutionRunnable,
42-
ITaskExecutionRunnable taskExecutionRunnable) {
43-
return !workflowExecutionRunnable.getWorkflowExecutionGraph().isExistFailureTaskExecutionRunnableChain();
44-
}
45-
4640
}

‎dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/policy/IWorkflowFailureStrategy.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,4 @@ public interface IWorkflowFailureStrategy {
2828
void onTaskFailure(IWorkflowExecutionRunnable workflowExecutionRunnable,
2929
ITaskExecutionRunnable taskExecutionRunnable);
3030

31-
boolean canTriggerSuccessor(IWorkflowExecutionRunnable workflowExecutionRunnable,
32-
ITaskExecutionRunnable taskExecutionRunnable);
33-
3431
}

‎dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/statemachine/AbstractWorkflowStateAction.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,6 @@ protected void tryToTriggerSuccessorsAfterTaskFinish(final IWorkflowExecutionRun
140140
return;
141141
}
142142

143-
if (!workflowFailureStrategy.canTriggerSuccessor(workflowExecutionRunnable, taskExecutionRunnable)) {
144-
emitWorkflowFinishedEventIfApplicable(workflowExecutionRunnable);
145-
return;
146-
}
147-
148143
triggerTasks(workflowExecutionRunnable, workflowExecutionGraph.getSuccessors(taskExecutionRunnable));
149144
}
150145

‎dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/WorkflowTestCaseContext.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.commons.collections4.CollectionUtils;
3030

3131
import java.util.List;
32+
import java.util.stream.Collectors;
3233

3334
import lombok.AllArgsConstructor;
3435
import lombok.Data;
@@ -66,9 +67,15 @@ public WorkflowDefinition getWorkflow(String name) {
6667
if (CollectionUtils.isEmpty(workflows)) {
6768
throw new IllegalStateException("workflows is empty");
6869
}
69-
return workflows.stream()
70+
List<WorkflowDefinition> collect = workflows.stream()
7071
.filter(workflow -> workflow.getName().equals(name))
71-
.findFirst()
72-
.orElseThrow(() -> new IllegalStateException("Workflow with name " + name + " not found"));
72+
.collect(Collectors.toList());
73+
if (CollectionUtils.isEmpty(collect)) {
74+
throw new IllegalStateException("Workflow with name " + name + " not found");
75+
}
76+
if (collect.size() > 1) {
77+
throw new IllegalStateException("Multiple workflows with name " + name + " found");
78+
}
79+
return collect.get(0);
7380
}
7481
}

‎dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/WorkflowTestCaseContextFactory.java‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,34 +90,36 @@ public WorkflowTestCaseContext initializeContextFromYaml(final String yamlPath)
9090
initializeWorkflowDefinitionToDB(workflowTestCaseContext.getWorkflows());
9191
initializeTaskDefinitionsToDB(workflowTestCaseContext.getTasks());
9292
initializeTaskRelationsToDB(workflowTestCaseContext.getTaskRelations());
93-
if (CollectionUtils.isNotEmpty(workflowTestCaseContext.getWorkflowInstances())) {
94-
initializeWorkflowInstancesToDB(workflowTestCaseContext.getWorkflowInstances());
95-
}
96-
if (CollectionUtils.isNotEmpty(workflowTestCaseContext.getTaskInstances())) {
97-
initializeTaskInstancesToDB(workflowTestCaseContext.getTaskInstances());
98-
}
99-
if (CollectionUtils.isNotEmpty(workflowTestCaseContext.getTaskGroups())) {
100-
initializeTaskGroupsToDB(workflowTestCaseContext.getTaskGroups());
101-
}
102-
if (CollectionUtils.isNotEmpty(workflowTestCaseContext.getEnvironments())) {
103-
initializeEnvironmentToDB(workflowTestCaseContext.getEnvironments());
104-
}
93+
94+
initializeWorkflowInstancesToDB(workflowTestCaseContext.getWorkflowInstances());
95+
initializeTaskInstancesToDB(workflowTestCaseContext.getTaskInstances());
96+
initializeTaskGroupsToDB(workflowTestCaseContext.getTaskGroups());
97+
initializeEnvironmentToDB(workflowTestCaseContext.getEnvironments());
10598
return workflowTestCaseContext;
10699
}
107100

108101
private void initializeTaskInstancesToDB(List<TaskInstance> taskInstances) {
102+
if (CollectionUtils.isEmpty(taskInstances)) {
103+
return;
104+
}
109105
for (TaskInstance taskInstance : taskInstances) {
110106
taskInstanceDao.insert(taskInstance);
111107
}
112108
}
113109

114110
private void initializeWorkflowInstancesToDB(List<WorkflowInstance> workflowInstances) {
111+
if (CollectionUtils.isEmpty(workflowInstances)) {
112+
return;
113+
}
115114
for (WorkflowInstance workflowInstance : workflowInstances) {
116115
workflowInstanceDao.insert(workflowInstance);
117116
}
118117
}
119118

120119
private void initializeWorkflowDefinitionToDB(final List<WorkflowDefinition> workflowDefinitions) {
120+
if (CollectionUtils.isEmpty(workflowDefinitions)) {
121+
return;
122+
}
121123
for (final WorkflowDefinition workflowDefinition : workflowDefinitions) {
122124
workflowDefinitionDao.insert(workflowDefinition);
123125
final WorkflowDefinitionLog workflowDefinitionLog = new WorkflowDefinitionLog(workflowDefinition);
@@ -128,6 +130,9 @@ private void initializeWorkflowDefinitionToDB(final List<WorkflowDefinition> wor
128130
}
129131

130132
private void initializeTaskDefinitionsToDB(final List<TaskDefinition> taskDefinitions) {
133+
if (CollectionUtils.isEmpty(taskDefinitions)) {
134+
return;
135+
}
131136
for (final TaskDefinition taskDefinition : taskDefinitions) {
132137
taskDefinitionDao.insert(taskDefinition);
133138

@@ -139,6 +144,9 @@ private void initializeTaskDefinitionsToDB(final List<TaskDefinition> taskDefini
139144
}
140145

141146
private void initializeTaskRelationsToDB(final List<WorkflowTaskRelation> taskRelations) {
147+
if (CollectionUtils.isEmpty(taskRelations)) {
148+
return;
149+
}
142150
for (final WorkflowTaskRelation taskRelation : taskRelations) {
143151
workflowTaskRelationMapper.insert(taskRelation);
144152

@@ -153,12 +161,18 @@ private void initializeProjectToDB(final Project project) {
153161
}
154162

155163
private void initializeTaskGroupsToDB(final List<TaskGroup> taskGroups) {
164+
if (CollectionUtils.isEmpty(taskGroups)) {
165+
return;
166+
}
156167
for (final TaskGroup taskGroup : taskGroups) {
157168
taskGroupDao.insert(taskGroup);
158169
}
159170
}
160171

161172
private void initializeEnvironmentToDB(final List<Environment> environments) {
173+
if (CollectionUtils.isEmpty(environments)) {
174+
return;
175+
}
162176
for (final Environment environment : environments) {
163177
environmentDao.insert(environment);
164178
}

0 commit comments

Comments
 (0)