From 5e7f12d4c3e2e37fa4bc065fddde8e191c336a15 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Wed, 19 Mar 2025 23:02:48 +0100 Subject: [PATCH 1/2] Report as debug log, the time spent waiting for resources Signed-off-by: Benoit Tigeot --- pkg/kube/wait.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index bdafc8255..357f7e3ec 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -49,6 +49,7 @@ type waiter struct { func (w *waiter) waitForResources(created ResourceList) error { w.log("beginning wait for %d resources with timeout of %v", len(created), w.timeout) + startTime := time.Now() ctx, cancel := context.WithTimeout(context.Background(), w.timeout) defer cancel() @@ -57,7 +58,7 @@ func (w *waiter) waitForResources(created ResourceList) error { numberOfErrors[i] = 0 } - return wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(ctx context.Context) (bool, error) { + err := wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(ctx context.Context) (bool, error) { waitRetries := 30 for i, v := range created { ready, err := w.c.IsReady(ctx, v) @@ -78,6 +79,15 @@ func (w *waiter) waitForResources(created ResourceList) error { } return true, nil }) + + elapsed := time.Since(startTime).Round(time.Second) + if err != nil { + w.log("wait for resources failed after %v: %v", elapsed, err) + } else { + w.log("wait for ressources succeeded within %v", elapsed) + } + + return err } func (w *waiter) isRetryableError(err error, resource *resource.Info) bool { From 422c58e4a2d7a00e2275916be1bfda0b28efba82 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Thu, 20 Mar 2025 21:43:35 +0100 Subject: [PATCH 2/2] Fix typo Signed-off-by: Benoit Tigeot --- pkg/kube/wait.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index 357f7e3ec..c602004ad 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -84,7 +84,7 @@ func (w *waiter) waitForResources(created ResourceList) error { if err != nil { w.log("wait for resources failed after %v: %v", elapsed, err) } else { - w.log("wait for ressources succeeded within %v", elapsed) + w.log("wait for resources succeeded within %v", elapsed) } return err