Merge pull request #1587 from mheon/fix_pod_status

Fix pod status reporting for new Exited state
This commit is contained in:
OpenShift Merge Robot 2018-10-08 11:09:28 -07:00 committed by GitHub
commit 71c2681310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -528,6 +528,8 @@ func getAndSortPodJSONParams(pods []*libpod.Pod, opts podPsOptions, runtime *lib
}
var status string
switch batchInfo.ConState {
case libpod.ContainerStateExited:
fallthrough
case libpod.ContainerStateStopped:
status = EXITED
case libpod.ContainerStateRunning:

View File

@ -35,6 +35,8 @@ func GetPodStatus(pod *libpod.Pod) (string, error) {
}
for _, ctrStatus := range ctrStatuses {
switch ctrStatus {
case libpod.ContainerStateExited:
fallthrough
case libpod.ContainerStateStopped:
statuses[stopped]++
case libpod.ContainerStateRunning: