cherry-pick [fix-#13045] fix endless loop #15092
This commit is contained in:
parent
ff5fecdfd5
commit
84b045bfd1
|
|
@ -55,10 +55,10 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler {
|
||||||
public void handleWorkflowEvent(final WorkflowEvent workflowEvent) throws WorkflowEventHandleError {
|
public void handleWorkflowEvent(final WorkflowEvent workflowEvent) throws WorkflowEventHandleError {
|
||||||
logger.info("Handle workflow start event, begin to start a workflow, event: {}", workflowEvent);
|
logger.info("Handle workflow start event, begin to start a workflow, event: {}", workflowEvent);
|
||||||
WorkflowExecuteRunnable workflowExecuteRunnable = processInstanceExecCacheManager.getByProcessInstanceId(
|
WorkflowExecuteRunnable workflowExecuteRunnable = processInstanceExecCacheManager.getByProcessInstanceId(
|
||||||
workflowEvent.getWorkflowInstanceId());
|
workflowEvent.getWorkflowInstanceId());
|
||||||
if (workflowExecuteRunnable == null) {
|
if (workflowExecuteRunnable == null) {
|
||||||
throw new WorkflowEventHandleError(
|
throw new WorkflowEventHandleError(
|
||||||
"The workflow start event is invalid, cannot find the workflow instance from cache");
|
"The workflow start event is invalid, cannot find the workflow instance from cache");
|
||||||
}
|
}
|
||||||
ProcessInstanceMetrics.incProcessInstanceByState("submit");
|
ProcessInstanceMetrics.incProcessInstanceByState("submit");
|
||||||
ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance();
|
ProcessInstance processInstance = workflowExecuteRunnable.getProcessInstance();
|
||||||
|
|
@ -71,7 +71,7 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler {
|
||||||
}
|
}
|
||||||
} else if (WorkflowSubmitStatue.FAILED == workflowSubmitStatue) {
|
} else if (WorkflowSubmitStatue.FAILED == workflowSubmitStatue) {
|
||||||
logger.error(
|
logger.error(
|
||||||
"Failed to submit the workflow instance, will resend the workflow start event: {}",
|
"Failed to submit the workflow instance, will send fail state event: {}",
|
||||||
workflowEvent);
|
workflowEvent);
|
||||||
WorkflowStateEvent stateEvent = WorkflowStateEvent.builder()
|
WorkflowStateEvent stateEvent = WorkflowStateEvent.builder()
|
||||||
.processInstanceId(processInstance.getId())
|
.processInstanceId(processInstance.getId())
|
||||||
|
|
@ -80,7 +80,7 @@ public class WorkflowStartEventHandler implements WorkflowEventHandler {
|
||||||
.build();
|
.build();
|
||||||
workflowExecuteRunnable.addStateEvent(stateEvent);
|
workflowExecuteRunnable.addStateEvent(stateEvent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,73 @@
|
||||||
|
/*
|
||||||
|
* 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.event;
|
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.common.enums.StateEventType;
|
||||||
|
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
|
||||||
|
import org.apache.dolphinscheduler.server.master.metrics.ProcessInstanceMetrics;
|
||||||
|
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteRunnable;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
import com.google.auto.service.AutoService;
|
||||||
|
|
||||||
|
@AutoService(StateEventHandler.class)
|
||||||
|
@Slf4j
|
||||||
|
public class WorkflowSubmitFailStateEventHandler implements StateEventHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handleStateEvent(WorkflowExecuteRunnable workflowExecuteRunnable,
|
||||||
|
StateEvent stateEvent) throws StateEventHandleException {
|
||||||
|
WorkflowStateEvent workflowStateEvent = (WorkflowStateEvent) stateEvent;
|
||||||
|
ProcessInstance processInstance =
|
||||||
|
workflowExecuteRunnable.getWorkflowExecuteContext().getWorkflowInstance();
|
||||||
|
measureProcessState(workflowStateEvent, processInstance.getProcessDefinitionCode().toString());
|
||||||
|
log.info(
|
||||||
|
"Handle workflow instance submit fail state event, the current workflow instance state {} will be changed to {}",
|
||||||
|
processInstance.getState(), workflowStateEvent.getStatus());
|
||||||
|
|
||||||
|
workflowExecuteRunnable.updateProcessInstanceState(workflowStateEvent);
|
||||||
|
workflowExecuteRunnable.endProcess();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StateEventType getEventType() {
|
||||||
|
return StateEventType.PROCESS_SUBMIT_FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void measureProcessState(WorkflowStateEvent processStateEvent, String processDefinitionCode) {
|
||||||
|
if (processStateEvent.getStatus().isFinished()) {
|
||||||
|
ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("finish", processDefinitionCode);
|
||||||
|
}
|
||||||
|
switch (processStateEvent.getStatus()) {
|
||||||
|
case STOP:
|
||||||
|
ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("stop", processDefinitionCode);
|
||||||
|
break;
|
||||||
|
case SUCCESS:
|
||||||
|
ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("success",
|
||||||
|
processDefinitionCode);
|
||||||
|
break;
|
||||||
|
case FAILURE:
|
||||||
|
ProcessInstanceMetrics.incProcessInstanceByStateAndProcessDefinitionCode("fail", processDefinitionCode);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue