From 17daab3a7d7e03d7c6fac92da2c710af2865bfda Mon Sep 17 00:00:00 2001
From: Mateusz Matejczyk <mmat@google.com>
Date: Fri, 12 Apr 2019 12:17:20 +0200
Subject: [PATCH] Fail on master or hollow nodes set-up error.

Ref. https://github.com/kubernetes/kubernetes/issues/76490
---
 test/kubemark/start-kubemark.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh
index b257b185acb..6cdf012fd9b 100755
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -494,6 +494,7 @@ function start-master {
   start-master-components
 }
 start-master &
+start_master_pid=$!
 
 # Setup for hollow-nodes.
 function start-hollow-nodes {
@@ -503,8 +504,11 @@ function start-hollow-nodes {
   wait-for-hollow-nodes-to-run-or-timeout
 }
 start-hollow-nodes &
+start_hollow_nodes_pid=$!
+
+wait $start_master_pid || { echo "Failed to start kubemark master" ; exit 1 ; }
+wait $start_hollow_nodes_pid ||{ echo "Failed to start hollow nodes" ; exit 1 ; }
 
-wait
 echo ""
 echo "Master IP: ${MASTER_IP}"
 echo "Password to kubemark master: ${KUBE_PASSWORD}"