github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10886 from thaJeztah/fix_retry_logs

Browse Source 
resolver/docker: fix confusing "trying next host" log
This commit is contained in:
Samuel Karp 2024-11-01 23:03:55 +00:00 committed by GitHub
commit cb4ce9a878
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/remotes/docker/resolver.go
View File

@ -285,8 +285,16 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
firstErr error firstErr error
firstErrPriority int firstErrPriority int
) )
nextHostOrFail := func(i int) string {
if i < len(hosts)-1 {
return "trying next host"
}
return "fetch failed"
}
for _, u := range paths { for _, u := range paths {
for _, host := range hosts { for i, host := range hosts {
ctx := log.WithLogger(ctx, log.G(ctx).WithField("host", host.Host)) ctx := log.WithLogger(ctx, log.G(ctx).WithField("host", host.Host))
req := base.request(host, http.MethodHead, u...) req := base.request(host, http.MethodHead, u...)
@ -308,7 +316,7 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
firstErr = err firstErr = err
firstErrPriority = 1 firstErrPriority = 1
} }
log.G(ctx).WithError(err).Info("trying next host") log.G(ctx).WithError(err).Info(nextHostOrFail(i))
continue // try another host continue // try another host
} }
resp.Body.Close() // don't care about body contents. resp.Body.Close() // don't care about body contents.
@ -319,7 +327,7 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
firstErr = fmt.Errorf("%s: %w", ref, errdefs.ErrNotFound) firstErr = fmt.Errorf("%s: %w", ref, errdefs.ErrNotFound)
firstErrPriority = 2 firstErrPriority = 2
} }
log.G(ctx).Info("trying next host - response was http.StatusNotFound") log.G(ctx).Infof("%s after status: %s", nextHostOrFail(i), resp.Status)
continue continue
} }
if resp.StatusCode > 399 { if resp.StatusCode > 399 {
@ -327,7 +335,7 @@ func (r *dockerResolver) Resolve(ctx context.Context, ref string) (string, ocisp
firstErr = remoteerrors.NewUnexpectedStatusErr(resp) firstErr = remoteerrors.NewUnexpectedStatusErr(resp)
firstErrPriority = 3 firstErrPriority = 3
} }
log.G(ctx).Infof("trying next host - response was %s", resp.Status) log.G(ctx).Infof("%s after status: %s", nextHostOrFail(i), resp.Status)
continue // try another host continue // try another host
} }
return "", ocispec.Descriptor{}, remoteerrors.NewUnexpectedStatusErr(resp) return "", ocispec.Descriptor{}, remoteerrors.NewUnexpectedStatusErr(resp)