Merge pull request #29973 from ZTE-PaaS/zhangke-patch-016

Automatic merge from submit-queue optimize podKiller for reading channel Reading kl.podKillingCh should check whether ok first, then to process data

Merge pull request #29973 from ZTE-PaaS/zhangke-patch-016
88f987e7 · Kubernetes Submit Queue · GitHub · 5230bb7a · 5d19daa2 · 88f987e7
Commit 88f987e7 authored Aug 04, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

kubelet.go pkg/kubelet/kubelet.go +4 -2

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1934,11 +1934,13 @@ func (kl *Kubelet) podKiller() {
 	for {
 		select {
 		case podPair, ok := <-kl.podKillingCh:
-			runningPod := podPair.RunningPod
-			apiPod := podPair.APIPod
 			if !ok {
 				return
 			}
+
+			runningPod := podPair.RunningPod
+			apiPod := podPair.APIPod
+
 			if killing.Has(string(runningPod.ID)) {
 				// The pod is already being killed.
 				break