From dc6c1f2145bf68e590baed1395320c6a56f997e1 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <sw5822@att.com>
Date: Fri, 31 May 2019 11:20:00 -0500
Subject: [PATCH] Elasticsearch: Update cluster-wait job script

This updates the cluster-wait job script to include a sleep for
when no nodes of a given type are detected.  This check was
previously executed only when a node count of (0 < x < expected)
was detected.  This update reduces the number of queries executed
against the Elasticsearch http endpoint

Change-Id: I15cb39250a5ab9a7f6df0d62c35289a55e109dbd
Signed-off-by: Steve Wilkerson <sw5822@att.com>
---
 .../templates/bin/_es-cluster-wait.sh.tpl      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/elasticsearch/templates/bin/_es-cluster-wait.sh.tpl b/elasticsearch/templates/bin/_es-cluster-wait.sh.tpl
index c8fb82368..c43d45925 100644
--- a/elasticsearch/templates/bin/_es-cluster-wait.sh.tpl
+++ b/elasticsearch/templates/bin/_es-cluster-wait.sh.tpl
@@ -31,10 +31,10 @@ function check_master_nodes() {
       else
         echo "Not all Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})"
         echo "$currentMasterNodes"
-        echo "Sleeping for 10 seconds before next check"
-        echo ""
-        sleep 10
       fi
+      echo "Sleeping for 10 seconds before next check"
+      echo ""
+      sleep 10
     fi
   done
   echo "All Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})"
@@ -58,10 +58,10 @@ function check_data_nodes() {
       else
         echo "Not all Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})"
         echo "$currentDataNodes"
-        echo "Sleeping for 10 seconds before next check"
-        echo ""
-        sleep 10
       fi
+      echo "Sleeping for 10 seconds before next check"
+      echo ""
+      sleep 10
     fi
   done
   echo "All Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})"
@@ -85,10 +85,10 @@ function check_client_nodes() {
       else
         echo "Not all Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})"
         echo "$currentClientNodes"
-        echo "Sleeping for 10 seconds before next check"
-        echo ""
-        sleep 10
       fi
+      echo "Sleeping for 10 seconds before next check"
+      echo ""
+      sleep 10
     fi
   done
   echo "All Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})"