github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kubelet: only check for container listed in the manifest 

also wait 1 retryDelay before polling state after syncing.
pull/6/head
Johan Euphrosine 2014-10-08 16:28:05 -07:00
parent 467a7a2cc1
commit 14c5fd405d
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/kubelet/runonce.go
View File

@ -73,6 +73,7 @@ func (kl *Kubelet) runOnce(pods []Pod) (results []RunPodResult, err error) {
res := <-ch res := <-ch
results = append(results, res) results = append(results, res)
if res.Err != nil { if res.Err != nil {
// TODO(proppy): report which containers failed the pod.
glog.Infof("failed to start pod %q: %v", res.Pod.Name, res.Err) glog.Infof("failed to start pod %q: %v", res.Pod.Name, res.Err)
failedPods = append(failedPods, res.Pod.Name) failedPods = append(failedPods, res.Pod.Name)
} else { } else {
@ -96,37 +97,55 @@ func (kl *Kubelet) runPod(pod Pod) (api.PodInfo, error) {
delay := RunOnceRetryDelay delay := RunOnceRetryDelay
retry := 0 retry := 0
for { for {
glog.Infof("syncing pod") running, info, err := kl.isPodRunning(pod)
err := kl.syncPod(&pod, dockerContainers) if err != nil {
return nil, fmt.Errorf("error checking pod status: %v", err)
}
if running {
glog.Infof("pod %q containers running", pod.Name)
return info, nil
}
glog.Infof("pod %q containers not running: syncing", pod.Name)
err = kl.syncPod(&pod, dockerContainers)
if err != nil { if err != nil {
return nil, fmt.Errorf("error syncing pod: %v", err) return nil, fmt.Errorf("error syncing pod: %v", err)
} }
info, err := kl.GetPodInfo(GetPodFullName(&pod), pod.Manifest.UUID)
if err != nil {
return nil, fmt.Errorf("error getting pod info: %v", err)
}
if podInfo(info).isRunning() {
return info, nil
}
if retry >= RunOnceMaxRetries { if retry >= RunOnceMaxRetries {
return nil, fmt.Errorf("timeout error: pod %q containers not running after %d retries", pod.Name, RunOnceMaxRetries) return info, fmt.Errorf("timeout error: pod %q containers not running after %d retries", pod.Name, RunOnceMaxRetries)
} }
glog.Infof("pod %q containers not running, waiting for %v", pod.Name, delay) // TODO(proppy): health checking would be better than waiting + checking the state at the next iteration.
glog.Infof("pod %q containers synced, waiting for %v", pod.Name, delay)
<-time.After(delay) <-time.After(delay)
retry++ retry++
delay *= RunOnceRetryDelayBackoff delay *= RunOnceRetryDelayBackoff
} }
} }
// Check if all containers of a manifest are running.
func (kl *Kubelet) isPodRunning(pod Pod) (bool, api.PodInfo, error) {
info, err := kl.GetPodInfo(GetPodFullName(&pod), pod.Manifest.UUID)
if err != nil {
return false, nil, fmt.Errorf("error getting pod info: %v", err)
}
for _, container := range pod.Manifest.Containers {
running := podInfo(info).isContainerRunning(container)
glog.Infof("container %q running: %v", container.Name, running)
if !running {
return false, info, nil
}
}
return true, info, nil
}
// Alias PodInfo for internal usage. // Alias PodInfo for internal usage.
type podInfo api.PodInfo type podInfo api.PodInfo
// Check if all containers of a pod are running. func (info podInfo) isContainerRunning(container api.Container) bool {
func (info podInfo) isRunning() bool { for name, status := range info {
for _, container := range info { glog.Infof("container %q status: %#v", name, status)
if container.State.Running == nil { if name == container.Name && status.State.Running != nil {
return false return true
} }
} }
return true return false
} }