Merge pull request #27 from sbezverk/issue_26

k8s-ci-robot · web-flow · commit 39e6a0324177 · 2018-12-20T14:02:29.000-08:00
Fixing leaking connections
diff --git a/cmd/main.go b/cmd/main.go
@@ -68,7 +68,6 @@ func getCSIConnection() (connection.CSIConnection, error) {
 }
 
 func checkHealth(w http.ResponseWriter, req *http.Request) {
-
 	glog.Infof("Request: %s from: %s\n", req.URL.Path, req.RemoteAddr)
 	csiConn, err := getCSIConnection()
 	if err != nil {
@@ -77,6 +76,7 @@ func checkHealth(w http.ResponseWriter, req *http.Request) {
 		glog.Infof("Failed to get connection to CSI  with error: %v.", err)
 		return
 	}
+	defer csiConn.Close()
 	ctx, cancel := context.WithTimeout(context.Background(), *connectionTimeout)
 	defer cancel()
 	if err := runProbe(ctx, csiConn); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ func getCSIConnection() (connection.CSIConnection, error) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func checkHealth(w http.ResponseWriter, req *http.Request) {`
`71`		`-`
`72`	`71`	`glog.Infof("Request: %s from: %s\n", req.URL.Path, req.RemoteAddr)`
`73`	`72`	`csiConn, err := getCSIConnection()`
`74`	`73`	`if err != nil {`
`@@ -77,6 +76,7 @@ func checkHealth(w http.ResponseWriter, req *http.Request) {`
`77`	`76`	`glog.Infof("Failed to get connection to CSI with error: %v.", err)`
`78`	`77`	`return`
`79`	`78`	`}`
	`79`	`+ defer csiConn.Close()`
`80`	`80`	`ctx, cancel := context.WithTimeout(context.Background(), *connectionTimeout)`
`81`	`81`	`defer cancel()`
`82`	`82`	`if err := runProbe(ctx, csiConn); err != nil {`