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

Adds a mutex to protect fallback host

Browse Source 
Race detector complains about concurrent access such as with Dispatch on
push.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-06-14 10:43:39 -07:00
parent 27de5fea73
commit 38e2f00382
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import (
"os" "os"
"path" "path"
"strings" "strings"
"sync"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
@ -728,11 +729,16 @@ func NewHTTPFallback(transport http.RoundTripper) http.RoundTripper {
type httpFallback struct { type httpFallback struct {
super http.RoundTripper super http.RoundTripper
host string host string
mu sync.Mutex
} }
func (f *httpFallback) RoundTrip(r *http.Request) (*http.Response, error) { func (f *httpFallback) RoundTrip(r *http.Request) (*http.Response, error) {
f.mu.Lock()
fallback := f.host == r.URL.Host
f.mu.Unlock()
// only fall back if the same host had previously fell back // only fall back if the same host had previously fell back
if f.host != r.URL.Host { if !fallback {
resp, err := f.super.RoundTrip(r) resp, err := f.super.RoundTrip(r)
if !isTLSError(err) && !isPortError(err, r.URL.Host) { if !isTLSError(err) && !isPortError(err, r.URL.Host) {
return resp, err return resp, err
@ -745,8 +751,12 @@ func (f *httpFallback) RoundTrip(r *http.Request) (*http.Response, error) {
plainHTTPRequest := *r plainHTTPRequest := *r
plainHTTPRequest.URL = &plainHTTPUrl plainHTTPRequest.URL = &plainHTTPUrl
if f.host != r.URL.Host { if !fallback {
f.host = r.URL.Host f.mu.Lock()
if f.host != r.URL.Host {
f.host = r.URL.Host
}
f.mu.Unlock()
// update body on the second attempt // update body on the second attempt
if r.Body != nil && r.GetBody != nil { if r.Body != nil && r.GetBody != nil {