From 372b3e80ad20a3af30069bc861d464eee9ccdcfd Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Thu, 1 Jul 2021 13:18:33 +0200
Subject: [PATCH] Wait functions now wait for ready replicas

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 pkg/burner/waiters.go | 17 +++++++++--------
 test/kube-burner.yml  |  3 ++-
 test/run.sh           |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/burner/waiters.go b/pkg/burner/waiters.go
index 0baa4ef7d..9632a04ce 100644
--- a/pkg/burner/waiters.go
+++ b/pkg/burner/waiters.go
@@ -23,7 +23,6 @@ import (
 	"github.com/cloud-bulldozer/kube-burner/log"
 
 	corev1 "k8s.io/api/core/v1"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -79,14 +78,15 @@ func (ex *Executor) waitForObjects(ns string) {
 
 func waitForDeployments(ns string, maxWaitTimeout time.Duration, wg *sync.WaitGroup) {
 	defer wg.Done()
+	// TODO handle errors such as timeouts
 	wait.PollImmediate(1*time.Second, maxWaitTimeout, func() (bool, error) {
 		deps, err := ClientSet.AppsV1().Deployments(ns).List(context.TODO(), metav1.ListOptions{})
 		if err != nil {
 			return false, err
 		}
 		for _, dep := range deps.Items {
-			if dep.Status.AvailableReplicas != *dep.Spec.Replicas {
-				log.Debugf("Waiting for Deployments in ns %s to be ready", ns)
+			if *dep.Spec.Replicas != dep.Status.ReadyReplicas {
+				log.Debugf("Waiting for replicas from deployments in ns %s to be ready", ns)
 				return false, nil
 			}
 		}
@@ -102,8 +102,8 @@ func waitForRS(ns string, maxWaitTimeout time.Duration, wg *sync.WaitGroup) {
 			return false, err
 		}
 		for _, rs := range rss.Items {
-			if *rs.Spec.Replicas != rs.Status.AvailableReplicas {
-				log.Debugf("Waiting for ReplicaSets in ns %s to be ready", ns)
+			if *rs.Spec.Replicas != rs.Status.ReadyReplicas {
+				log.Debugf("Waiting for replicas from replicaSets in ns %s to be ready", ns)
 				return false, nil
 			}
 		}
@@ -120,7 +120,7 @@ func waitForRC(ns string, maxWaitTimeout time.Duration, wg *sync.WaitGroup) {
 		}
 		for _, rc := range rcs.Items {
 			if *rc.Spec.Replicas != rc.Status.ReadyReplicas {
-				log.Debugf("Waiting for ReplicationControllers in ns %s to be ready", ns)
+				log.Debugf("Waiting for replicas from replicationControllers in ns %s to be ready", ns)
 				return false, nil
 			}
 		}
@@ -136,8 +136,8 @@ func waitForDS(ns string, maxWaitTimeout time.Duration, wg *sync.WaitGroup) {
 			return false, err
 		}
 		for _, ds := range dss.Items {
-			if ds.Status.DesiredNumberScheduled != ds.Status.NumberAvailable {
-				log.Debugf("Waiting for daemonsets in ns %s to be readt", ns)
+			if ds.Status.DesiredNumberScheduled != ds.Status.NumberReady {
+				log.Debugf("Waiting for replicas from daemonsets in ns %s to be ready", ns)
 				return false, nil
 			}
 		}
@@ -153,6 +153,7 @@ func waitForPod(ns string, maxWaitTimeout time.Duration, wg *sync.WaitGroup) {
 			return false, err
 		}
 		for _, pod := range pods.Items {
+			// TODO Check for all containers from the pod to be in ready state
 			if pod.Status.Phase != corev1.PodRunning {
 				log.Debugf("Waiting for pods in ns %s to be running", ns)
 				return false, nil
diff --git a/test/kube-burner.yml b/test/kube-burner.yml
index ce62e0c5a..03d521aef 100644
--- a/test/kube-burner.yml
+++ b/test/kube-burner.yml
@@ -34,7 +34,7 @@ jobs:
 
   - name: not-namespaced
     jobType: create
-    jobIterations: {{randInteger 1 4}}
+    jobIterations: {{randInteger 1 2}}
     qps: 5
     burst: 15
     namespacedIterations: false
@@ -44,6 +44,7 @@ jobs:
     waitWhenFinished: false
     verifyObjects: true
     errorOnVerify: true
+    maxWaitTimeout: 2m
     objects:
     
     - objectTemplate: objectTemplates/deployment.yml
diff --git a/test/run.sh b/test/run.sh
index f9e03c9d0..627e6a1e1 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -47,7 +47,7 @@ check_files () {
 }
 
 log "Running kube-burner init"
-kube-burner init -c kube-burner.yml --uuid ${uuid} --log-level=debug -u http://localhost:9090 -m metrics-profile.yaml -a alert-profile.yaml
+timeout 120 kube-burner init -c kube-burner.yml --uuid ${uuid} --log-level=debug -u http://localhost:9090 -m metrics-profile.yaml -a alert-profile.yaml
 check_files
 check_ns kube-burner-job=namespaced,kube-burner-uuid=${uuid} 5
 check_destroyed_ns kube-burner-job=not-namespaced,kube-burner-uuid=${uuid}