github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Converted errch to a buffered channel to avoid goroutine leak

Browse Source 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
This commit is contained in:
Gaurav Singh 2020-05-18 09:29:19 -04:00
parent 0d0af48444
commit c5f73de4fd
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go
View File

@ -287,7 +287,7 @@ func (c *AvailableConditionController) sync(key string) error {
} }
discoveryURL.Path = "/apis/" + apiService.Spec.Group + "/" + apiService.Spec.Version discoveryURL.Path = "/apis/" + apiService.Spec.Group + "/" + apiService.Spec.Version
errCh := make(chan error) errCh := make(chan error, 1)
go func() { go func() {
// be sure to check a URL that the aggregated API server is required to serve // be sure to check a URL that the aggregated API server is required to serve
newReq, err := http.NewRequest("GET", discoveryURL.String(), nil) newReq, err := http.NewRequest("GET", discoveryURL.String(), nil)
@ -321,13 +321,6 @@ func (c *AvailableConditionController) sync(key string) error {
// we had trouble with slow dial and DNS responses causing us to wait too long. // we had trouble with slow dial and DNS responses causing us to wait too long.
// we added this as insurance // we added this as insurance
case <-time.After(6 * time.Second): case <-time.After(6 * time.Second):
// errCh needs to have a reader since the above goroutine doing the work
// needs to send to it.
go func() {
if res := <-errch; res != nil {
fmt.Errorf("timed out response from %v: %v", discoveryURL, res)
}
}()
results <- fmt.Errorf("timed out waiting for %v", discoveryURL) results <- fmt.Errorf("timed out waiting for %v", discoveryURL)
return return
} }