Merge pull request #58 from scuzhanglei/master

k8s-ci-robot · web-flow · commit 2afda2fcc8be · 2019-12-30T10:23:39.000-08:00
Fix error nil pointer bug when driver not ok but respond
diff --git a/cmd/livenessprobe/main.go b/cmd/livenessprobe/main.go
@@ -61,7 +61,7 @@ func (h *healthProbe) checkProbe(w http.ResponseWriter, req *http.Request) {
 
 	if !ready {
 		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte(err.Error()))
+		w.Write([]byte("driver responded but is not ready"))
 		klog.Error("driver responded but is not ready")
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (h healthProbe) checkProbe(w http.ResponseWriter, req http.Request) {`
`61`	`61`
`62`	`62`	`if !ready {`
`63`	`63`	`w.WriteHeader(http.StatusInternalServerError)`
`64`		`- w.Write([]byte(err.Error()))`
	`64`	`+ w.Write([]byte("driver responded but is not ready"))`
`65`	`65`	`klog.Error("driver responded but is not ready")`
`66`	`66`	`return`
`67`	`67`	`}`