github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24487 from cjcullen/sshleak 

Automatic merge from submit-queue

Fix goroutine leak in ssh-tunnel healthcheck.

Tunnel healthchecks were not closing the HTTP response body, leading to many open goroutines.
pull/6/head
k8s-merge-robot 2016-04-19 13:51:15 -07:00
parent d1c5ae65d8 cba5e84fd1
commit c6fec87021
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/ssh/ssh.go
View File

@ -362,9 +362,13 @@ func (l *SSHTunnelList) healthCheck(e sshTunnelEntry) error {
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}) })
client := &http.Client{Transport: transport} client := &http.Client{Transport: transport}
_, err := client.Get(l.healthCheckURL.String()) resp, err := client.Get(l.healthCheckURL.String())
if err != nil {
return err return err
} }
resp.Body.Close()
return nil
}
func (l *SSHTunnelList) removeAndReAdd(e sshTunnelEntry) { func (l *SSHTunnelList) removeAndReAdd(e sshTunnelEntry) {
// Find the entry to replace. // Find the entry to replace.