summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-06 12:55:46 +0000
committerGerrit Code Review <review@openstack.org>2016-01-06 12:55:46 +0000
commit6aecba80dc6dbe426f91db4a86874f4c5ca61357 (patch)
treea29c9515b5b214bfd8fef34ba57a2b7240146547
parentdccf97a000af99a2d76f9a5d4cc5f3d024b50693 (diff)
parent7643dc8a49d8f6533d9c00d3d0fcd643c3985e3a (diff)
Merge "Ensure cluster remains stable during services restarts"
-rwxr-xr-xextraconfig/tasks/pacemaker_resource_restart.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index 4e8b20fd..12201097 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -26,6 +26,7 @@ function check_resource {
sleep $check_interval
else
echo "$service has $state"
+ timeout -k 10 $timeout crm_resource --wait
return
fi
done
@@ -50,7 +51,7 @@ if [ "$pacemaker_status" = "active" -a \
pcs resource disable httpd
check_resource httpd stopped 300
pcs resource disable openstack-keystone
- check_resource openstack-keystone stopped 1200
+ check_resource openstack-keystone stopped 1800
if pcs status | grep haproxy-clone; then
pcs resource restart haproxy-clone
@@ -62,7 +63,7 @@ if [ "$pacemaker_status" = "active" -a \
pcs resource restart galera-master
pcs resource enable openstack-keystone
- check_resource openstack-keystone started 300
+ check_resource openstack-keystone started 1800
pcs resource enable httpd
check_resource httpd started 800