openstack/openstack-helm-infra
Code Issues Proposed changes

Elasticsearch: Update cluster-wait job script

Browse Source 
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>
This commit is contained in:
Steve Wilkerson 2019-05-31 11:20:00 -05:00 committed by Steve Wilkerson
parent 2f0c2e328d
commit dc6c1f2145
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elasticsearch/templates/bin/_es-cluster-wait.sh.tpl
View File

@ -31,11 +31,11 @@ function check_master_nodes() {
else else
echo "Not all Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})" echo "Not all Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})"
echo "$currentMasterNodes" echo "$currentMasterNodes"
fi
echo "Sleeping for 10 seconds before next check" echo "Sleeping for 10 seconds before next check"
echo "" echo ""
sleep 10 sleep 10
fi fi
fi
done done
echo "All Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})" echo "All Elasticsearch master nodes accounted for and ready: (${numMasterNodes} / ${expectedMasterNodes})"
echo "$currentMasterNodes" echo "$currentMasterNodes"
@ -58,11 +58,11 @@ function check_data_nodes() {
else else
echo "Not all Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})" echo "Not all Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})"
echo "$currentDataNodes" echo "$currentDataNodes"
fi
echo "Sleeping for 10 seconds before next check" echo "Sleeping for 10 seconds before next check"
echo "" echo ""
sleep 10 sleep 10
fi fi
fi
done done
echo "All Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})" echo "All Elasticsearch data nodes accounted for and ready: (${numDataNodes} / ${expectedDataNodes})"
echo "$currentDataNodes" echo "$currentDataNodes"
@ -85,11 +85,11 @@ function check_client_nodes() {
else else
echo "Not all Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})" echo "Not all Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})"
echo "$currentClientNodes" echo "$currentClientNodes"
fi
echo "Sleeping for 10 seconds before next check" echo "Sleeping for 10 seconds before next check"
echo "" echo ""
sleep 10 sleep 10
fi fi
fi
done done
echo "All Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})" echo "All Elasticsearch client nodes accounted for and ready: (${numClientNodes} / ${expectedClientNodes})"
echo "$currentClientNodes" echo "$currentClientNodes"