scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rkt: fix KillPod() to return the correct error message.

Browse Source
This commit is contained in:
Yifan Gu
2016-02-22 17:07:31 -08:00
parent 201d60b426
commit 2d2225414f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/rkt/rkt.go
View File

@@ -1045,7 +1045,8 @@ func (r *Runtime) KillPod(pod *api.Pod, runningPod kubecontainer.Pod) error {
res := <-reschan res := <-reschan
if res != "done" { if res != "done" {
glog.Errorf("rkt: Failed to stop unit %q: %s", serviceName, res) err := fmt.Errorf("invalid result: %s", res)
glog.Errorf("rkt: Failed to stop unit %q: %v", serviceName, err)
return err return err
} }