From 2d2225414faa32b10d74a3f2d868c5bdb95729a3 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Mon, 22 Feb 2016 17:07:31 -0800 Subject: [PATCH] rkt: fix KillPod() to return the correct error message. --- pkg/kubelet/rkt/rkt.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 3691d53f7c0..87059ef7dfb 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -1045,7 +1045,8 @@ func (r *Runtime) KillPod(pod *api.Pod, runningPod kubecontainer.Pod) error { res := <-reschan 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 }