github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix PodInfo to include last terminated container info when calling

Browse Source 
GetPodInfo based on name and UUID. With this fix, if some of containers
are dead, the pod status will stay as Running, not reset back to Waiting.
This commit is contained in:
Dawn Chen 2014-09-10 13:20:29 -07:00
parent fc7f2f1058
commit b48834e198
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/docker.go
View File

@ -180,14 +180,14 @@ func getRecentDockerContainersWithNameAndUUID(client DockerInterface, podFullNam
return result, nil
}
// ErrNoContainersInPod is returned when there are no running containers for a given pod
// ErrNoContainersInPod is returned when there are no containers for a given pod
var ErrNoContainersInPod = errors.New("no containers exist for this pod")
// GetDockerPodInfo returns docker info for all containers in the pod/manifest.
func getDockerPodInfo(client DockerInterface, podFullName, uuid string) (api.PodInfo, error) {
info := api.PodInfo{}
containers, err := client.ListContainers(docker.ListContainersOptions{})
containers, err := client.ListContainers(docker.ListContainersOptions{All: true})
if err != nil {
return nil, err
}
@ -200,6 +200,11 @@ func getDockerPodInfo(client DockerInterface, podFullName, uuid string) (api.Pod
if uuid != "" && dockerUUID != uuid {
continue
}
// We assume docker return us a list of containers in time order
if _, ok := info[dockerContainerName]; ok {
continue
}
inspectResult, err := client.InspectContainer(value.ID)
if err != nil {
return nil, err