openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Run cluster check on nodes configured in wsrep_cluster_address."

This commit is contained in:
Jenkins 2017-03-30 09:03:54 +00:00 committed by Gerrit Code Review
parent ebf1d47b71 d39c952fd3
commit d95674dc70
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
extraconfig/tasks/yum_update.sh
View File

@ -113,15 +113,19 @@ if [[ "$pacemaker_status" == "active" ]] ; then
fi
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
RETVAL=$( pcs resource show galera-master | grep wsrep_cluster_address | grep -q `crm_node -n` ; echo $? )
if [[ $RETVAL -eq 0 && -e /etc/sysconfig/clustercheck ]]; then
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
fi
echo "Waiting for pacemaker cluster to settle"
if ! timeout -k 10 $cluster_settle_timeout crm_resource --wait; then