Merge pull request #66005 from Random-Liu/automated-cherry-pick-of-#65987-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #65987: Fix pod worker deadlock. Cherry pick of #65987 on release-1.10. #65987: Fix pod worker deadlock.

Merge pull request #66005 from Random-Liu/automated-cherry-pick-of-#65987-upstream-release-1.10
95eea8a8 · Kubernetes Submit Queue · GitHub · 4c7141ca · 9ca42278 · 95eea8a8
Unverified Commit 95eea8a8 authored Jul 11, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

pod_workers.go pkg/kubelet/pod_workers.go +1 -1

No files found.
--- a/pkg/kubelet/pod_workers.go
+++ b/pkg/kubelet/pod_workers.go
@@ -306,7 +306,7 @@ func killPodNow(podWorkers PodWorkers, recorder record.EventRecorder) eviction.K
 		type response struct {
 			err error
 		}
-		ch := make(chan response)
+		ch := make(chan response, 1)
 		podWorkers.UpdatePod(&UpdatePodOptions{
 			Pod:        pod,
 			UpdateType: kubetypes.SyncPodKill,