github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24743 from pmorie/kill-pod-errs

Browse Source 
Clearly identify errors killing pods in events and logs
This commit is contained in:
Mike Danese
2016-05-20 16:38:51 -07:00
parent 3e5c77efea 451c7f28b2
commit 63b7c05bc4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/kubelet.go
View File

@@ -1787,14 +1787,13 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
kl.statusManager.SetPodStatus(pod, apiPodStatus) kl.statusManager.SetPodStatus(pod, apiPodStatus)
// Kill pod if it should not be running // Kill pod if it should not be running
if err := canRunPod(pod); err != nil || pod.DeletionTimestamp != nil || apiPodStatus.Phase == api.PodFailed { if errOuter := canRunPod(pod); errOuter != nil || pod.DeletionTimestamp != nil || apiPodStatus.Phase == api.PodFailed {
if err := kl.killPod(pod, nil, podStatus, nil); err != nil { if errInner := kl.killPod(pod, nil, podStatus, nil); errInner != nil {
// there was an error killing the pod, so we return that error directly errOuter = fmt.Errorf("error killing pod: %v", errInner)
utilruntime.HandleError(err) utilruntime.HandleError(errOuter)
return err
} }
// there was no error killing the pod, but the pod cannot be run, so we return that err (if any) // there was no error killing the pod, but the pod cannot be run, so we return that err (if any)
return err return errOuter
} }
// Create Mirror Pod for Static Pod if it doesn't already exist // Create Mirror Pod for Static Pod if it doesn't already exist