fix: correctly respect max-pull-attempt-* options

stackrox · Dec 5, 2024 · d1e5a2b · d1e5a2b
1 parent af6c094
commit d1e5a2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/internal/main.go b/internal/main.go
@@ -161,10 +161,10 @@ func pullImageWithRetries(ctx context.Context, logger *slog.Logger, wg *sync.Wai
 			return
 		}
 		// Be exponentially more patient on each attempt, but prevent overflows.
-		attemptTimeout = min(attemptTimeout*2, timing.MaxPullAttemptDelay)
+		attemptTimeout = min(attemptTimeout*2, timing.MaxPullAttemptTimeout)
 		logger.InfoContext(ctx, "sleeping before retry", "timeout", delay)
 		time.Sleep(delay)
-		delay = delay * 2
+		delay = min(delay*2, timing.MaxPullAttemptDelay)
 	}
 }
 

diff --git a/internal/metrics/tools/go.mod b/internal/metrics/tools/go.mod
@@ -1,6 +1,8 @@
 module github.com/stackrox/image-prefetcher/internal/metrics/tools
 
-go 1.20
+go 1.21
+
+toolchain go1.22.1
 
 require (
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1