diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java index e08e33a8d2..2f5b4a28a9 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java @@ -25,7 +25,7 @@ import org.apache.dolphinscheduler.server.master.metrics.ProcessInstanceMetrics; import org.apache.dolphinscheduler.server.master.runner.StateWheelExecuteThread; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool; -import org.apache.dolphinscheduler.server.master.runner.WorkflowSubmitStatue; +import org.apache.dolphinscheduler.server.master.runner.WorkflowSubmitStatus; import java.util.concurrent.CompletableFuture; @@ -63,13 +63,13 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler { ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("submit", processInstance.getProcessDefinitionCode().toString()); CompletableFuture.supplyAsync(workflowExecuteRunnable::call, workflowExecuteThreadPool) - .thenAccept(workflowSubmitStatue -> { - if (WorkflowSubmitStatue.SUCCESS == workflowSubmitStatue) { + .thenAccept(workflowSubmitStatus -> { + if (WorkflowSubmitStatus.SUCCESS == workflowSubmitStatus) { log.info("Success submit the workflow instance"); if (processInstance.getTimeout() > 0) { stateWheelExecuteThread.addProcess4TimeoutCheck(processInstance); } - } else if (WorkflowSubmitStatue.FAILED == workflowSubmitStatue) { + } else if (WorkflowSubmitStatus.FAILED == workflowSubmitStatus) { log.error( "Failed to submit the workflow instance, will resend the workflow start event: {}", workflowEvent); diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java index b5d8ed3356..07bde4479c 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java @@ -135,7 +135,7 @@ import com.google.common.collect.Sets; * Workflow execute task, used to execute a workflow instance. */ @Slf4j -public class WorkflowExecuteRunnable implements Callable { +public class WorkflowExecuteRunnable implements Callable { private final ProcessService processService; @@ -720,11 +720,11 @@ public class WorkflowExecuteRunnable implements Callable { * ProcessInstance start entrypoint. */ @Override - public WorkflowSubmitStatue call() { + public WorkflowSubmitStatus call() { if (isStart()) { // This case should not been happened log.warn("[WorkflowInstance-{}] The workflow has already been started", processInstance.getId()); - return WorkflowSubmitStatue.DUPLICATED_SUBMITTED; + return WorkflowSubmitStatus.DUPLICATED_SUBMITTED; } try { @@ -744,10 +744,10 @@ public class WorkflowExecuteRunnable implements Callable { workflowRunnableStatus = WorkflowRunnableStatus.STARTED; log.info("workflowStatue changed to :{}", workflowRunnableStatus); } - return WorkflowSubmitStatue.SUCCESS; + return WorkflowSubmitStatus.SUCCESS; } catch (Exception e) { log.error("Start workflow error", e); - return WorkflowSubmitStatue.FAILED; + return WorkflowSubmitStatus.FAILED; } finally { LogUtils.removeWorkflowInstanceIdMDC(); } diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatue.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatus.java similarity index 96% rename from dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatue.java rename to dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatus.java index b53a500c89..b965079bc8 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatue.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatus.java @@ -17,7 +17,7 @@ package org.apache.dolphinscheduler.server.master.runner; -public enum WorkflowSubmitStatue { +public enum WorkflowSubmitStatus { /** * Submit success */