From 1069fe2865049248b3dedd494c435dd939848201 Mon Sep 17 00:00:00 2001 From: Daniel Rammer Date: Thu, 2 Jun 2022 20:13:14 -0500 Subject: [PATCH] calling abort rather than finalize on permanent failure Signed-off-by: Daniel Rammer --- pkg/controller/nodes/executor.go | 2 +- pkg/controller/nodes/executor_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/nodes/executor.go b/pkg/controller/nodes/executor.go index a2df13d89..c4ca81e77 100644 --- a/pkg/controller/nodes/executor.go +++ b/pkg/controller/nodes/executor.go @@ -659,7 +659,7 @@ func (c *nodeExecutor) handleNode(ctx context.Context, dag executors.DAGStructur if currentPhase == v1alpha1.NodePhaseFailing { logger.Debugf(ctx, "node failing") - if err := c.finalize(ctx, h, nCtx); err != nil { + if err := c.abort(ctx, h, nCtx, "node failing"); err != nil { return executors.NodeStatusUndefined, err } nodeStatus.UpdatePhase(v1alpha1.NodePhaseFailed, v1.Now(), nodeStatus.GetMessage(), nodeStatus.GetExecutionError()) diff --git a/pkg/controller/nodes/executor_test.go b/pkg/controller/nodes/executor_test.go index 1624d9083..8e55f276e 100644 --- a/pkg/controller/nodes/executor_test.go +++ b/pkg/controller/nodes/executor_test.go @@ -790,6 +790,7 @@ func TestNodeExecutor_RecursiveNodeHandler_Recurse(t *testing.T) { } else { h.OnFinalizeMatch(mock.Anything, mock.Anything).Return(nil) } + h.OnAbortMatch(mock.Anything, mock.Anything, mock.Anything).Return(nil) hf.OnGetHandler(v1alpha1.NodeKindTask).Return(h, nil) mockWf, _, mockNodeStatus := createSingleNodeWf(test.currentNodePhase, 0)