openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Verify galera is sync'd in yum_update.sh"

Browse Source
This commit is contained in:
Jenkins 2015-11-18 10:53:59 +00:00 committed by Gerrit Code Review
commit 37f712d07f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extraconfig/tasks/yum_update.sh
View File

@ -23,6 +23,7 @@ update_identifier=${update_identifier//[^a-zA-Z0-9-_]/}
# seconds to wait for this node to rejoin the cluster after update # seconds to wait for this node to rejoin the cluster after update
cluster_start_timeout=360 cluster_start_timeout=360
galera_sync_timeout=360
timestamp_file="$timestamp_dir/$update_identifier" timestamp_file="$timestamp_dir/$update_identifier"
if [[ -a "$timestamp_file" ]]; then if [[ -a "$timestamp_file" ]]; then
@ -185,6 +186,17 @@ if [[ "$pacemaker_status" == "active" ]] ; then
exit 1 exit 1
fi fi
done done
tstart=$(date +%s)
while ! clustercheck; do
sleep 5
tnow=$(date +%s)
if (( tnow-tstart > galera_sync_timeout )) ; then
echo "ERROR galera sync timed out"
exit 1
fi
done
pcs status pcs status
else else