Merge pull request #64 from vuntz/ocf-fix-notify-start
OCF RA: Fix various issues with start notification handler
This commit is contained in:
commit
7e93369f0c
|
@ -2187,16 +2187,15 @@ action_notify() {
|
|||
;;
|
||||
start)
|
||||
ocf_log info "${LH} post-start begin."
|
||||
local nodes_list="${OCF_RESKEY_CRM_meta_notify_start_uname} ${OCF_RESKEY_CRM_meta_notify_active_uname}"
|
||||
# Do nothing, if the list of nodes being started or running reported empty
|
||||
# Delegate recovery, if needed, to the "running out of the cluster" monitor's logic
|
||||
if [ -z "${nodes_list}" ] ; then
|
||||
if [ -z "${OCF_RESKEY_CRM_meta_notify_start_uname}" -a -z "${OCF_RESKEY_CRM_meta_notify_active_uname}" ] ; then
|
||||
ocf_log warn "${LH} I'm a last man standing and I must survive!"
|
||||
ocf_log info "${LH} post-start end."
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
# check did this event from this host
|
||||
my_host "${nodes_list}"
|
||||
my_host "${OCF_RESKEY_CRM_meta_notify_start_uname}"
|
||||
rc=$?
|
||||
# Do nothing, if there is no master reported
|
||||
# Delegate recovery, if needed, to the "running out of the cluster" monitor's logic
|
||||
|
@ -2223,7 +2222,6 @@ action_notify() {
|
|||
rc2=$?
|
||||
update_rabbit_start_time_if_rc $rc2
|
||||
fi
|
||||
ocf_log info "${LH} post-start end."
|
||||
if [ -s "${OCF_RESKEY_definitions_dump_file}" ] ; then
|
||||
ocf_log info "File ${OCF_RESKEY_definitions_dump_file} exists"
|
||||
ocf_run curl --silent --show-error --request POST --user $OCF_RESKEY_admin_user:$OCF_RESKEY_admin_password $OCF_RESKEY_host_ip:15672/api/definitions --header "Content-Type:application/json" --data @$OCF_RESKEY_definitions_dump_file
|
||||
|
@ -2240,6 +2238,7 @@ action_notify() {
|
|||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
ocf_log info "${LH} post-start end."
|
||||
;;
|
||||
stop)
|
||||
# if rabbitmq-server stops on any another node, we should remove it from cluster (as ordinary operation)
|
||||
|
|
Loading…
Reference in New Issue