From 1307f081f21e63e4b5c39b5fccd17c20ffda6bed Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Mon, 28 Sep 2015 16:11:48 -0700
Subject: [PATCH] e2e: RunRC wait until all pods created by RC are ready

kubelet sends up status updates to flip the ready condition of a pod after the
pod is already in the running state. RunRC should wait until the pod condition
is ready to make sure there is no pending status update which may affect the
follow-up performance test.
---
 test/e2e/util.go | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/e2e/util.go b/test/e2e/util.go
index d2ab300ad37..a237b88712c 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -1270,6 +1270,7 @@ func RunRC(config RCConfig) error {
 		terminating := 0
 
 		running := 0
+		runningButNotReady := 0
 		waiting := 0
 		pending := 0
 		unknown := 0
@@ -1286,7 +1287,19 @@ func RunRC(config RCConfig) error {
 			}
 			created = append(created, p)
 			if p.Status.Phase == api.PodRunning {
-				running++
+				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++
+				} else {
+					runningButNotReady++
+				}
 				for _, v := range FailedContainers(p) {
 					failedContainers = failedContainers + v.restarts
 					containerRestartNodes.Insert(p.Spec.NodeName)
@@ -1308,13 +1321,13 @@ func RunRC(config RCConfig) error {
 			*config.CreatedPods = pods
 		}
 
-		Logf("%v %v Pods: %d out of %d created, %d running, %d pending, %d waiting, %d inactive, %d terminating, %d unknown ",
-			time.Now(), rc.Name, len(pods), config.Replicas, running, pending, waiting, inactive, terminating, 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, runningButNotReady)
 
 		promPushRunningPending(running, pending)
 
 		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 {