diff options
author | 2016-01-05 10:19:15 +0000 | |
---|---|---|
committer | 2016-01-05 10:19:15 +0000 | |
commit | c7878be6b40ef7680616c2378589df1225caa4b6 (patch) | |
tree | 6aa55c3f5c0eaa5da14e4a591d8f61b3e2ac58d0 /extraconfig/tasks | |
parent | 5e30128459191e1122a73cc4971472fd818b5e38 (diff) | |
parent | ac7467bacddb98fbb9fc9716ba56cad0d6f282de (diff) |
Merge "Wait for cluster to settle in yum_update.sh"
Diffstat (limited to 'extraconfig/tasks')
-rwxr-xr-x | extraconfig/tasks/yum_update.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index e32369e1..2d6b8cc2 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -24,6 +24,7 @@ update_identifier=${update_identifier//[^a-zA-Z0-9-_]/} # seconds to wait for this node to rejoin the cluster after update cluster_start_timeout=600 galera_sync_timeout=360 +cluster_settle_timeout=1800 timestamp_file="$timestamp_dir/$update_identifier" if [[ -a "$timestamp_file" ]]; then @@ -128,7 +129,10 @@ openstack-nova-scheduler" pcs -f $pacemaker_dumpfile resource update mongod op stop timeout=100s echo "Applying new Pacemaker config" - pcs cluster cib-push $pacemaker_dumpfile + if ! pcs cluster cib-push $pacemaker_dumpfile; then + echo "ERROR failed to apply new pacemaker config" + exit 1 + fi echo "Pacemaker running, stopping cluster node and doing full package update" node_count=$(pcs status xml | grep -o "<nodes_configured.*/>" | grep -o 'number="[0-9]*"' | grep -o "[0-9]*") @@ -188,6 +192,12 @@ if [[ "$pacemaker_status" == "active" ]] ; then fi done + echo "Waiting for pacemaker cluster to settle" + if ! timeout -k 10 $cluster_settle_timeout crm_resource --wait; then + echo "ERROR timed out while waiting for the cluster to settle" + exit 1 + fi + pcs status else |