Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust rate limit to 100/min #14

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions builds.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var (
cacheResolve = sync.Map{}
cacheFile string

registryRateLimiter = rate.NewLimiter(500/rate.Limit((1*time.Minute).Seconds()), 100) // stick to at most 500/min in registry/Hub requests (and allow an immediate burst of 100)
registryRateLimiter = rate.NewLimiter(100/rate.Limit((1*time.Minute).Seconds()), 100) // stick to at most 100/min in registry/Hub requests (and allow an immediate burst of 100)
)

type cacheResolveType struct {
Expand All @@ -81,6 +81,7 @@ func resolveRemoteArch(ctx context.Context, img string, arch string, diskCacheFo
var (
ret = cacheResolveType{}
err error
individualLookupLimiter = rate.NewLimiter(rate.Every(time.Second), 2) // only do each image lookup at most once per second
)

shouldRetry := func(err error) bool {
Expand All @@ -106,8 +107,10 @@ func resolveRemoteArch(ctx context.Context, img string, arch string, diskCacheFo
}

for {
err = registryRateLimiter.Wait(ctx)
if err != nil {
if err := individualLookupLimiter.Wait(ctx); err != nil {
return nil, err
}
if err := registryRateLimiter.Wait(ctx); err != nil {
return nil, err
}

Expand All @@ -125,8 +128,10 @@ func resolveRemoteArch(ctx context.Context, img string, arch string, diskCacheFo
}

for {
err = registryRateLimiter.Wait(ctx)
if err != nil {
if err := individualLookupLimiter.Wait(ctx); err != nil {
return nil, err
}
if err := registryRateLimiter.Wait(ctx); err != nil {
return nil, err
}

Expand Down