Merge pull request kubernetes#81604 from tedyu/kubeadm-close-err

k8s-ci-robot · web-flow · commit 66b0a0c17dff · 2019-08-19T15:09:44.000-07:00
Check the error return from listener close
diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go
@@ -208,7 +208,10 @@ func (poc PortOpenCheck) Check() (warnings, errorList []error) {
 		errorList = []error{errors.Errorf("Port %d is in use", poc.port)}
 	}
 	if ln != nil {
-		ln.Close()
+		if err = ln.Close(); err != nil {
+			warnings = append(warnings,
+				errors.Errorf("when closing port %d, encountered %v", poc.port, err))
+		}
 	}
 
 	return nil, errorList

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,10 @@ func (poc PortOpenCheck) Check() (warnings, errorList []error) {`
`208`	`208`	`errorList = []error{errors.Errorf("Port %d is in use", poc.port)}`
`209`	`209`	`}`
`210`	`210`	`if ln != nil {`
`211`		`- ln.Close()`
	`211`	`+ if err = ln.Close(); err != nil {`
	`212`	`+ warnings = append(warnings,`
	`213`	`+ errors.Errorf("when closing port %d, encountered %v", poc.port, err))`
	`214`	`+ }`
`212`	`215`	`}`
`213`	`216`
`214`	`217`	`return nil, errorList`