github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

runonce: handle inspect error

Browse Source
This commit is contained in:
Johan Euphrosine 2014-10-10 15:46:24 -07:00
parent 6cd0c261b3
commit 14c3b9d900
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/runonce.go
View File

@ -95,7 +95,11 @@ func (kl *Kubelet) runPod(pod api.BoundPod) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to get kubelet docker containers: %v", err) return fmt.Errorf("failed to get kubelet docker containers: %v", err)
} }
if running := kl.isPodRunning(pod, dockerContainers); running { running, err := kl.isPodRunning(pod, dockerContainers)
if err != nil {
return fmt.Errorf("failed to check pod status: %v", err)
}
if running {
glog.Infof("pod %q containers running", pod.ID) glog.Infof("pod %q containers running", pod.ID)
return nil return nil
} }
@ -115,22 +119,22 @@ func (kl *Kubelet) runPod(pod api.BoundPod) error {
} }
// isPodRunning returns true if all containers of a manifest are running. // isPodRunning returns true if all containers of a manifest are running.
func (kl *Kubelet) isPodRunning(pod api.BoundPod, dockerContainers dockertools.DockerContainers) bool { func (kl *Kubelet) isPodRunning(pod api.BoundPod, dockerContainers dockertools.DockerContainers) (bool, error) {
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
dockerContainer, found, _ := dockerContainers.FindPodContainer(GetPodFullName(&pod), pod.UID, container.Name) dockerContainer, found, _ := dockerContainers.FindPodContainer(GetPodFullName(&pod), pod.UID, container.Name)
if !found { if !found {
glog.Infof("container %q not found", container.Name) glog.Infof("container %q not found", container.Name)
return false return false, nil
} }
inspectResult, err := kl.dockerClient.InspectContainer(dockerContainer.ID) inspectResult, err := kl.dockerClient.InspectContainer(dockerContainer.ID)
if err != nil { if err != nil {
glog.Infof("failed to inspect container %q: %v", container.Name, err) glog.Infof("failed to inspect container %q: %v", container.Name, err)
return false return false, err
} }
if !inspectResult.State.Running { if !inspectResult.State.Running {
glog.Infof("container %q not running: %#v", container.Name, inspectResult.State) glog.Infof("container %q not running: %#v", container.Name, inspectResult.State)
return false return false, nil
} }
} }
return true return true, nil
} }