Merge pull request cli#4403 from cli/cs-concurrent-requests

mislav · web-flow · commit cb6db95ec6fd · 2021-10-01T17:26:04.000+02:00
Don't allow the lazyLoadedHTTPClient mutex to wrap `Do()`
diff --git a/pkg/cmd/root/root.go b/pkg/cmd/root/root.go
@@ -151,14 +151,14 @@ func (l *lazyLoadedHTTPClient) Do(req *http.Request) (*http.Response, error) {
 	l.httpClientMu.RUnlock()
 
 	if httpClient == nil {
-		l.httpClientMu.Lock()
-		defer l.httpClientMu.Unlock()
-
 		var err error
+		l.httpClientMu.Lock()
 		l.httpClient, err = l.factory.HttpClient()
+		l.httpClientMu.Unlock()
 		if err != nil {
 			return nil, err
 		}
 	}
+
 	return l.httpClient.Do(req)
 }

Original file line number	Diff line number	Diff line change
`@@ -151,14 +151,14 @@ func (l lazyLoadedHTTPClient) Do(req http.Request) (*http.Response, error) {`
`151`	`151`	`l.httpClientMu.RUnlock()`
`152`	`152`
`153`	`153`	`if httpClient == nil {`
`154`		`- l.httpClientMu.Lock()`
`155`		`- defer l.httpClientMu.Unlock()`
`156`		`-`
`157`	`154`	`var err error`
	`155`	`+ l.httpClientMu.Lock()`
`158`	`156`	`l.httpClient, err = l.factory.HttpClient()`
	`157`	`+ l.httpClientMu.Unlock()`
`159`	`158`	`if err != nil {`
`160`	`159`	`return nil, err`
`161`	`160`	`}`
`162`	`161`	`}`
	`162`	`+`
`163`	`163`	`return l.httpClient.Do(req)`
`164`	`164`	`}`