Skip to content

convertor: Retry on 5xx errors #19

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.

Sign up for GitHub

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

Merged
gautam-rl merged 2 commits into from
Sep 11, 2025
Merged

convertor: Retry on 5xx errors #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1abf746
Add retries on 5xx errors
gautam-rl Sep 11, 2025
9ee4277
fix
gautam-rl Sep 11, 2025
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
36 changes: 26 additions & 10 deletions cmd/convertor/builder/builder_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/continuity"
"github.com/containerd/errdefs"
Expand All @@ -54,18 +55,33 @@ func isRetryableError(err error) bool {
return false
}

// Check for containerd docker error types
var dockerErr *docker.Error
if errors.As(err, &dockerErr) {
switch dockerErr.Code {
case docker.ErrorCodeTooManyRequests:
return true
case docker.ErrorCodeUnavailable:
// Registry may return multiple errors in one response (docker.Errors)
var regErrs docker.Errors
if errors.As(err, &regErrs) {
for _, e := range regErrs {
switch v := e.(type) {
case docker.ErrorCode:
if v == docker.ErrorCodeTooManyRequests || v == docker.ErrorCodeUnavailable || v == docker.ErrorCodeUnknown {
return true
}
case docker.Error:
if v.Code == docker.ErrorCodeTooManyRequests || v.Code == docker.ErrorCodeUnavailable || v.Code == docker.ErrorCodeUnknown {
return true
}
}
}
}

// Unexpected HTTP status codes (e.g., 429 or 5xx)
var us remoteerrors.ErrUnexpectedStatus
if errors.As(err, &us) {
if us.StatusCode == 429 || (us.StatusCode >= 500 && us.StatusCode <= 599) {
return true
default:
return false
}
} else if err, ok := err.(net.Error); ok && err.Timeout() {
}

// Network timeouts
if ne, ok := err.(net.Error); ok && ne.Timeout() {
return true
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/convertor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ func init() {
rootCmd.Flags().IntVar(&concurrencyLimit, "concurrency-limit", 4, "the number of manifests that can be built at the same time, used for multi-arch images, 0 means no limit")
rootCmd.Flags().BoolVar(&disableSparse, "disable-sparse", false, "disable sparse file for overlaybd")
rootCmd.Flags().BoolVar(&referrer, "referrer", false, "push converted manifests with subject, note '--oci' will be enabled automatically if '--referrer' is set, cause the referrer must be in OCI format.")
rootCmd.Flags().IntVar(&retryCount, "retry-count", 5, "number of retries for registry upload operations when encountering 429 rate limiting")
rootCmd.Flags().IntVar(&retryCount, "retry-count", 5, "number of retries for registry upload operations when encountering 429 rate limiting or 5xx errors")

// tar import/export
rootCmd.Flags().StringVar(&importTar, "import-tar", "", "import image from tar file (OCI layout format)")
Expand Down
Loading