Inform about time spent waiting resources to be ready in slog format

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
pull/30696/head
Benoit Tigeot 6 months ago
parent b304ee495d
commit 0e4d185370
No known key found for this signature in database
GPG Key ID: 8E6D4FC8AEBDA62C

@ -19,6 +19,7 @@ package kube // import "helm.sh/helm/v4/pkg/kube"
import ( import (
"context" "context"
"fmt" "fmt"
"log/slog"
"net/http" "net/http"
"time" "time"
@ -101,12 +102,13 @@ func (w *waiter) isRetryableHTTPStatusCode(httpStatusCode int32) bool {
// waitForDeletedResources polls to check if all the resources are deleted or a timeout is reached // waitForDeletedResources polls to check if all the resources are deleted or a timeout is reached
func (w *waiter) waitForDeletedResources(deleted ResourceList) error { func (w *waiter) waitForDeletedResources(deleted ResourceList) error {
w.log("beginning wait for %d resources to be deleted with timeout of %v", len(deleted), w.timeout) slog.Info("beginning wait for resources to be deleted", "count", len(deleted), "timeout", w.timeout)
startTime := time.Now()
ctx, cancel := context.WithTimeout(context.Background(), w.timeout) ctx, cancel := context.WithTimeout(context.Background(), w.timeout)
defer cancel() defer cancel()
return wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(_ context.Context) (bool, error) { err := wait.PollUntilContextCancel(ctx, 2*time.Second, true, func(ctx context.Context) (bool, error) {
for _, v := range deleted { for _, v := range deleted {
err := v.Get() err := v.Get()
if err == nil || !apierrors.IsNotFound(err) { if err == nil || !apierrors.IsNotFound(err) {
@ -115,6 +117,15 @@ func (w *waiter) waitForDeletedResources(deleted ResourceList) error {
} }
return true, nil return true, nil
}) })
elapsed := time.Since(startTime).Round(time.Second)
if err != nil {
slog.Debug("wait for resources failed", "elapsed", elapsed, "error", err)
} else {
slog.Debug("wait for resources succeeded", "elapsed", elapsed)
}
return err
} }
// SelectorsForObject returns the pod label selector for a given object // SelectorsForObject returns the pod label selector for a given object

Loading…
Cancel
Save