Browse Source

[Improvement]Update spelling mistake for the name of WorkflowSubmitStatue (#13850)

* Correct the spelling of an enum
3.2.0-release
SYSU-Coder 1 year ago committed by GitHub
parent
commit
aec1366732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/event/WorkflowStartEventHandler.java
  2. 10
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
  3. 2
      dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatus.java

8
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.StateWheelExecuteThread;
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable; import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable;
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool; 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; import java.util.concurrent.CompletableFuture;
@ -63,13 +63,13 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler {
ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("submit", ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("submit",
processInstance.getProcessDefinitionCode().toString()); processInstance.getProcessDefinitionCode().toString());
CompletableFuture.supplyAsync(workflowExecuteRunnable::call, workflowExecuteThreadPool) CompletableFuture.supplyAsync(workflowExecuteRunnable::call, workflowExecuteThreadPool)
.thenAccept(workflowSubmitStatue -> { .thenAccept(workflowSubmitStatus -> {
if (WorkflowSubmitStatue.SUCCESS == workflowSubmitStatue) { if (WorkflowSubmitStatus.SUCCESS == workflowSubmitStatus) {
log.info("Success submit the workflow instance"); log.info("Success submit the workflow instance");
if (processInstance.getTimeout() > 0) { if (processInstance.getTimeout() > 0) {
stateWheelExecuteThread.addProcess4TimeoutCheck(processInstance); stateWheelExecuteThread.addProcess4TimeoutCheck(processInstance);
} }
} else if (WorkflowSubmitStatue.FAILED == workflowSubmitStatue) { } else if (WorkflowSubmitStatus.FAILED == workflowSubmitStatus) {
log.error( log.error(
"Failed to submit the workflow instance, will resend the workflow start event: {}", "Failed to submit the workflow instance, will resend the workflow start event: {}",
workflowEvent); workflowEvent);

10
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. * Workflow execute task, used to execute a workflow instance.
*/ */
@Slf4j @Slf4j
public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> { public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatus> {
private final ProcessService processService; private final ProcessService processService;
@ -720,11 +720,11 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> {
* ProcessInstance start entrypoint. * ProcessInstance start entrypoint.
*/ */
@Override @Override
public WorkflowSubmitStatue call() { public WorkflowSubmitStatus call() {
if (isStart()) { if (isStart()) {
// This case should not been happened // This case should not been happened
log.warn("[WorkflowInstance-{}] The workflow has already been started", processInstance.getId()); log.warn("[WorkflowInstance-{}] The workflow has already been started", processInstance.getId());
return WorkflowSubmitStatue.DUPLICATED_SUBMITTED; return WorkflowSubmitStatus.DUPLICATED_SUBMITTED;
} }
try { try {
@ -744,10 +744,10 @@ public class WorkflowExecuteRunnable implements Callable<WorkflowSubmitStatue> {
workflowRunnableStatus = WorkflowRunnableStatus.STARTED; workflowRunnableStatus = WorkflowRunnableStatus.STARTED;
log.info("workflowStatue changed to :{}", workflowRunnableStatus); log.info("workflowStatue changed to :{}", workflowRunnableStatus);
} }
return WorkflowSubmitStatue.SUCCESS; return WorkflowSubmitStatus.SUCCESS;
} catch (Exception e) { } catch (Exception e) {
log.error("Start workflow error", e); log.error("Start workflow error", e);
return WorkflowSubmitStatue.FAILED; return WorkflowSubmitStatus.FAILED;
} finally { } finally {
LogUtils.removeWorkflowInstanceIdMDC(); LogUtils.removeWorkflowInstanceIdMDC();
} }

2
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatue.java → dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowSubmitStatus.java

@ -17,7 +17,7 @@
package org.apache.dolphinscheduler.server.master.runner; package org.apache.dolphinscheduler.server.master.runner;
public enum WorkflowSubmitStatue { public enum WorkflowSubmitStatus {
/** /**
* Submit success * Submit success
*/ */
Loading…
Cancel
Save