fix: remove completed taskset status before update workflow. Fixes: #…

…12832 (#12835) Signed-off-by: shuangkun <[email protected]> (cherry picked from commit cd0c58e)
argoproj · Apr 19, 2024 · 8c9a857 · 8c9a857
1 parent ce7cad3
commit 8c9a857
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -745,6 +745,12 @@ func (woc *wfOperationCtx) persistUpdates(ctx context.Context) {
 		}
 	}
 
+	// Remove completed taskset status before update workflow.
+	err = woc.removeCompletedTaskSetStatus(ctx)
+	if err != nil {
+		woc.log.WithError(err).Warn("error updating taskset")
+	}
+
 	wf, err := wfClient.Update(ctx, woc.wf, metav1.UpdateOptions{})
 	if err != nil {
 		woc.log.Warnf("Error updating workflow: %v %s", err, apierr.ReasonForError(err))
@@ -792,12 +798,6 @@ func (woc *wfOperationCtx) persistUpdates(ctx context.Context) {
 		time.Sleep(1 * time.Second)
 	}
 
-	err = woc.removeCompletedTaskSetStatus(ctx)
-
-	if err != nil {
-		woc.log.WithError(err).Warn("error updating taskset")
-	}
-
 	// Make sure the workflow completed.
 	if woc.wf.Status.Fulfilled() {
 		if err := woc.deleteTaskResults(ctx); err != nil {