From e675331ce2544a30b9ba3fda4bf3bdc71fd634dd Mon Sep 17 00:00:00 2001
From: justinsb <justinsb@google.com>
Date: Thu, 31 Aug 2023 11:37:26 -0400
Subject: [PATCH] Improve status printing when tasks are in progress

Previously we were implying that the tasks were somehow failing,but
this isn't quite right when they emit the try-again-later error.

Also pretty-print the pluralization while we're here.
---
 upup/pkg/fi/executor.go | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/upup/pkg/fi/executor.go b/upup/pkg/fi/executor.go
index 586686e979..ec0ca82ac3 100644
--- a/upup/pkg/fi/executor.go
+++ b/upup/pkg/fi/executor.go
@@ -17,6 +17,7 @@ limitations under the License.
 package fi
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -119,7 +120,7 @@ func (e *executor[T]) RunTasks(taskMap map[string]Task[T]) error {
 		tasks = append(tasks, canRun...)
 
 		taskErrors := e.forkJoin(tasks)
-		var errors []error
+		var errs []error
 		for i, err := range taskErrors {
 			ts := tasks[i]
 			if err != nil {
@@ -138,7 +139,7 @@ func (e *executor[T]) RunTasks(taskMap map[string]Task[T]) error {
 				} else {
 					klog.Warningf("error running task %q (%v remaining to succeed): %v", ts.key, remaining, err)
 				}
-				errors = append(errors, err)
+				errs = append(errs, err)
 				ts.lastError = err
 			} else {
 				ts.done = true
@@ -148,11 +149,32 @@ func (e *executor[T]) RunTasks(taskMap map[string]Task[T]) error {
 		}
 
 		if !progress {
-			if len(errors) == 0 {
+			n := len(errs)
+
+			if n == 0 {
 				// Logic error!
 				panic("did not make progress executing tasks; but no errors reported")
 			}
-			klog.Infof("No progress made, sleeping before retrying %d task(s)", len(errors))
+
+			tryAgainLaterCount := 0
+			for _, err := range errs {
+				var tryAgainLaterError TryAgainLaterError
+				if !errors.Is(err, &tryAgainLaterError) {
+					tryAgainLaterCount++
+				}
+			}
+			formatTaskCount := func(n int) string {
+				if n == 1 {
+					return "1 task"
+				} else {
+					return fmt.Sprintf("%d tasks", n)
+				}
+			}
+			if tryAgainLaterCount == n {
+				klog.Infof("continuing to run %s", formatTaskCount(tryAgainLaterCount))
+			} else {
+				klog.Infof("No progress made, sleeping before retrying %s", formatTaskCount(n))
+			}
 			time.Sleep(e.options.WaitAfterAllTasksFailed)
 		}
 	}