From 784e5f5db30b496df9673ce70604a8724e7653fc Mon Sep 17 00:00:00 2001 From: FogDong Date: Fri, 27 May 2022 18:40:09 +0800 Subject: [PATCH] nit fix Signed-off-by: FogDong --- .../v1alpha2/application/application_controller.go | 3 --- pkg/workflow/tasks/custom/task.go | 2 +- pkg/workflow/workflow.go | 13 ++++++------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go b/pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go index 08773b92f..aa918c25a 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go +++ b/pkg/controller/core.oam.dev/v1alpha2/application/application_controller.go @@ -241,9 +241,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu if err := r.doWorkflowFinish(app, wf); err != nil { return r.endWithNegativeCondition(ctx, app, condition.ErrorCondition(common.WorkflowCondition.String(), errors.WithMessage(err, "DoWorkflowFinish")), common.ApplicationRunningWorkflow) } - if !workflow.IsFailedAfterRetry(app) { - r.stateKeep(logCtx, handler, app) - } return r.gcResourceTrackers(logCtx, handler, common.ApplicationWorkflowTerminated, false, true) case common.WorkflowStateExecuting: logCtx.Info("Workflow return state=Executing") diff --git a/pkg/workflow/tasks/custom/task.go b/pkg/workflow/tasks/custom/task.go index e6a624676..378e66cc8 100644 --- a/pkg/workflow/tasks/custom/task.go +++ b/pkg/workflow/tasks/custom/task.go @@ -480,7 +480,7 @@ func SkipTaskRunner(options *SkipOptions) bool { case "": return options.DependsOnPhase != common.WorkflowStepPhaseSucceeded default: - // TODO:(fog) support cue syntax in if + // TODO:(fog) support more if cases return false } } diff --git a/pkg/workflow/workflow.go b/pkg/workflow/workflow.go index fc3a5826f..3addc8a35 100644 --- a/pkg/workflow/workflow.go +++ b/pkg/workflow/workflow.go @@ -119,7 +119,7 @@ func (w *workflow) ExecuteSteps(ctx monitorContext.Context, appRev *oamcore.Appl StepStatusCache.Delete(cacheKey) return common.WorkflowStateFinished, nil } - if (wfStatus.Terminated && allTasksDone) || (wfStatus.Terminated && wfStatus.Suspend) { + if checkWorkflowTerminated(wfStatus, allTasksDone) { return common.WorkflowStateTerminated, nil } if wfStatus.Suspend { @@ -155,20 +155,15 @@ func (w *workflow) ExecuteSteps(ctx monitorContext.Context, appRev *oamcore.Appl } e.checkWorkflowStatusMessage(wfStatus) - fmt.Println(99999, e.status.Message) StepStatusCache.Store(cacheKey, len(wfStatus.Steps)) allTasksDone, allTasksSucceeded = w.allDone(taskRunners) if wfStatus.Terminated { e.cleanBackoffTimesForTerminated() - if allTasksDone || wfStatus.Suspend { + if checkWorkflowTerminated(wfStatus, allTasksDone) { wfContext.CleanupMemoryStore(e.app.Name, e.app.Namespace) return common.WorkflowStateTerminated, nil } } - if (wfStatus.Terminated && allTasksDone) || (wfStatus.Terminated && wfStatus.Suspend) { - wfContext.CleanupMemoryStore(e.app.Name, e.app.Namespace) - return common.WorkflowStateTerminated, nil - } if wfStatus.Suspend { wfContext.CleanupMemoryStore(e.app.Name, e.app.Namespace) return common.WorkflowStateSuspended, nil @@ -181,6 +176,10 @@ func (w *workflow) ExecuteSteps(ctx monitorContext.Context, appRev *oamcore.Appl return common.WorkflowStateExecuting, nil } +func checkWorkflowTerminated(wfStatus *common.WorkflowStatus, allTasksDone bool) bool { + return (wfStatus.Terminated && allTasksDone) || (wfStatus.Terminated && wfStatus.Suspend) +} + func (w *workflow) restartWorkflow(ctx monitorContext.Context, revAndSpecHash string) (common.WorkflowState, error) { ctx.Info("Restart Workflow") status := w.app.Status.Workflow