Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Abort subworkflow on subnode failure #468

Merged
merged 7 commits into from
Sep 8, 2022
Merged

Abort subworkflow on subnode failure #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2528c2a
using 'failing' state to handle subworkflow aborts
hamersaw Aug 8, 2022
4eb0853
propogating node failure is subworkflow to subworkflow failure messag…
hamersaw Aug 9, 2022
ecf12ca
working with other failure scenarios
hamersaw Aug 9, 2022
102d875
fixed lint issue
hamersaw Aug 9, 2022
7be20bc
Merge branch 'master' into bug/subworkflow-abort
hamersaw Aug 9, 2022
9f3aae7
updated error message to match
hamersaw Aug 9, 2022
0ef221c
Merge branch 'master' into bug/subworkflow-abort
hamersaw Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/controller/nodes/node_state_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func (n nodeStateManager) GetWorkflowNodeState() handler.WorkflowNodeState {
ws := handler.WorkflowNodeState{}
if wn != nil {
ws.Phase = wn.GetWorkflowNodePhase()
ws.Error = wn.GetExecutionError()
}
return ws
}
Expand Down
23 changes: 17 additions & 6 deletions pkg/controller/nodes/subworkflow/subworkflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ func (s *subworkflowHandler) handleSubWorkflow(ctx context.Context, nCtx handler
}

err = nCtx.NodeStateWriter().PutWorkflowNodeState(workflowNodeState)
if subworkflow.GetOnFailureNode() != nil {
return handler.DoTransition(handler.TransitionTypeEphemeral, handler.PhaseInfoFailingErr(state.Err, nil)), err
if err != nil {
logger.Warnf(ctx, "failed to store failing subworkflow state with err: [%v]", err)
return handler.UnknownTransition, err
}

return handler.DoTransition(handler.TransitionTypeEphemeral, handler.PhaseInfoFailureErr(state.Err, nil)), err
return handler.DoTransition(handler.TransitionTypeEphemeral, handler.PhaseInfoRunning(nil)), nil
}

if state.IsComplete() {
Expand Down Expand Up @@ -190,14 +191,24 @@ func (s *subworkflowHandler) HandleFailingSubWorkflow(ctx context.Context, nCtx
return handler.DoTransition(handler.TransitionTypeEphemeral, handler.PhaseInfoFailure(core.ExecutionError_SYSTEM, errors.SubWorkflowExecutionFailed, err.Error(), nil)), nil
}

status := nCtx.NodeStatus()
status.GetWorkflowNodeStatus()
if err := s.HandleAbort(ctx, nCtx, "subworkflow failed"); err != nil {
logger.Warnf(ctx, "failed to abort failing subworkflow with err: [%v]", err)
return handler.DoTransition(handler.TransitionTypeEphemeral, handler.PhaseInfoUndefined), err
}

if subWorkflow.GetOnFailureNode() == nil {
logger.Infof(ctx, "Subworkflow has no failure nodes, failing immediately.")
state := nCtx.NodeStateReader().GetWorkflowNodeState()
if state.Error != nil {
return handler.DoTransition(handler.TransitionTypeEphemeral,
handler.PhaseInfoFailureErr(state.Error, nil)), nil
}

return handler.DoTransition(handler.TransitionTypeEphemeral,
handler.PhaseInfoFailureErr(nCtx.NodeStateReader().GetWorkflowNodeState().Error, nil)), err
handler.PhaseInfoFailure(core.ExecutionError_UNKNOWN, "SubworkflowNodeFailing", "", nil)), nil
}

status := nCtx.NodeStatus()
nodeLookup := executors.NewNodeLookup(subWorkflow, status)
return s.HandleFailureNodeOfSubWorkflow(ctx, nCtx, subWorkflow, nodeLookup)
}
Expand Down