github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14699 from yujuhong/pods_ready

Browse Source 
e2e: RunRC wait until all pods created by RC are ready
This commit is contained in:
Filip Grzadkowski 2015-09-29 13:54:52 +02:00
commit 0f8adc5d53
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/util.go
View File

@ -1270,6 +1270,7 @@ func RunRC(config RCConfig) error {
terminating := 0 terminating := 0
running := 0 running := 0
runningButNotReady := 0
waiting := 0 waiting := 0
pending := 0 pending := 0
unknown := 0 unknown := 0
@ -1286,7 +1287,19 @@ func RunRC(config RCConfig) error {
} }
created = append(created, p) created = append(created, p)
if p.Status.Phase == api.PodRunning { if p.Status.Phase == api.PodRunning {
ready := false
for _, c := range p.Status.Conditions {
if c.Type == api.PodReady && c.Status == api.ConditionTrue {
ready = true
break
}
}
if ready {
// Only count a pod is running when it is also ready.
running++ running++
} else {
runningButNotReady++
}
for _, v := range FailedContainers(p) { for _, v := range FailedContainers(p) {
failedContainers = failedContainers + v.restarts failedContainers = failedContainers + v.restarts
containerRestartNodes.Insert(p.Spec.NodeName) containerRestartNodes.Insert(p.Spec.NodeName)
@ -1308,13 +1321,13 @@ func RunRC(config RCConfig) error {
*config.CreatedPods = pods *config.CreatedPods = pods
} }
Logf("%v %v Pods: %d out of %d created, %d running, %d pending, %d waiting, %d inactive, %d terminating, %d unknown ", Logf("%v %v Pods: %d out of %d created, %d running, %d pending, %d waiting, %d inactive, %d terminating, %d unknown, %d runningButNotReady ",
time.Now(), rc.Name, len(pods), config.Replicas, running, pending, waiting, inactive, terminating, unknown) time.Now(), rc.Name, len(pods), config.Replicas, running, pending, waiting, inactive, terminating, unknown, runningButNotReady)
promPushRunningPending(running, pending) promPushRunningPending(running, pending)
if config.PodStatusFile != nil { if config.PodStatusFile != nil {
fmt.Fprintf(config.PodStatusFile, "%s, %d, running, %d, pending, %d, waiting, %d, inactive, %d, unknown\n", time.Now(), running, pending, waiting, inactive, unknown) fmt.Fprintf(config.PodStatusFile, "%s, %d, running, %d, pending, %d, waiting, %d, inactive, %d, unknown, %d, runningButNotReady\n", time.Now(), running, pending, waiting, inactive, unknown, runningButNotReady)
} }
if failedContainers > maxContainerFailures { if failedContainers > maxContainerFailures {