From 9e5bc6593898e4a400797ab5d3a74db7b4746329 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 22 Dec 2015 12:06:55 +0100 Subject: Split pacemaker common check_service function out of _restart.sh Also split out echo_error function to DRY the error output code and allow changing the way we report errors in a single place. Change-Id: I448bf0eb49390f03155335736bb4ab4e979db128 Co-Authored-By: Jiri Stransky --- extraconfig/tasks/pacemaker_resource_restart.sh | 33 ------------------------- 1 file changed, 33 deletions(-) (limited to 'extraconfig/tasks/pacemaker_resource_restart.sh') diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh index dfc335bf..b2bdc55a 100755 --- a/extraconfig/tasks/pacemaker_resource_restart.sh +++ b/extraconfig/tasks/pacemaker_resource_restart.sh @@ -3,39 +3,6 @@ set -eux pacemaker_status=$(systemctl is-active pacemaker) -check_interval=3 - -function check_resource { - - if [ "$#" -ne 3 ]; then - echo "ERROR: check_resource function expects 3 parameters, $# given" | tee /dev/fd/2 - exit 1 - fi - - service=$1 - state=$2 - timeout=$3 - - if [ "$state" = "stopped" ]; then - match_for_incomplete='Started' - else # started - match_for_incomplete='Stopped' - fi - - if timeout -k 10 $timeout crm_resource --wait; then - node_states=$(pcs status --full | grep "$service" | grep -v Clone) - if echo "$node_states" | grep -q "$match_for_incomplete"; then - echo "ERROR: cluster settled but $service was not in $state state, exiting." | tee /dev/fd/2 - exit 1 - else - echo "$service has $state" - fi - else - echo "ERROR: cluster remained unstable for more than $timeout seconds, exiting." | tee /dev/fd/2 - exit 1 - fi - -} # Run if pacemaker is running, we're the bootstrap node, # and we're updating the deployment (not creating). -- cgit 1.2.3-korg