From e48f9959872a32f713726ce3859b50d52591a07f Mon Sep 17 00:00:00 2001 From: Ke Zhang Date: Sat, 30 Jul 2016 11:47:50 +0800 Subject: [PATCH] pods can not admitted should return directly --- pkg/kubelet/runonce.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index 9caf530a6a3..24ffc59834c 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -73,18 +73,20 @@ func (kl *Kubelet) runOnce(pods []*api.Pod, retryDelay time.Duration) (results [ // Check if we can admit the pod. if ok, reason, message := kl.canAdmitPod(admitted, pod); !ok { kl.rejectPod(pod, reason, message) - } else { - admitted = append(admitted, pod) + results = append(results, RunPodResult{pod, nil}) + continue } + + admitted = append(admitted, pod) go func(pod *api.Pod) { err := kl.runPod(pod, retryDelay) ch <- RunPodResult{pod, err} }(pod) } - glog.Infof("waiting for %d pods", len(pods)) + glog.Infof("Waiting for %d pods", len(admitted)) failedPods := []string{} - for i := 0; i < len(pods); i++ { + for i := 0; i < len(admitted); i++ { res := <-ch results = append(results, res) if res.Err != nil {