summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-01-20 16:03:48 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-01-20 16:03:48 +0300
commit3d1f30e4824f7ba50576617ab3e966509d6d46c4 (patch)
tree8b2aca7bc93bffd2b5b39145d9779e53f7febbc0 /scripts
parent0e5362d0cbf31eaf520c8f62fd23d3ab0fd40e5d (diff)
parentafd30fb0a1739ab8d6c027416ce9ea146a02eb2c (diff)
downloadrabbitmq-server-git-3d1f30e4824f7ba50576617ab3e966509d6d46c4.tar.gz
Merge branch 'stable'
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server-ha.ocf3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 84dae25cf1..fe4357cb3c 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -1505,6 +1505,7 @@ get_monitor() {
timeout_alive=$?
if [ $timeout_alive -eq 2 ]; then
+ master_score 0
return $OCF_ERR_GENERIC
elif [ $timeout_alive -eq 0 ]; then
if [ $rc_alive -ne 0 ]; then
@@ -1527,6 +1528,7 @@ get_monitor() {
timeout_alarms=$?
if [ $timeout_alarms -eq 2 ]; then
+ master_score 0
return $OCF_ERR_GENERIC
elif [ $timeout_alarms -eq 0 ]; then
@@ -1558,6 +1560,7 @@ get_monitor() {
timeout_queues=$?
if [ $timeout_queues -eq 2 ]; then
+ master_score 0
return $OCF_ERR_GENERIC
elif [ $timeout_queues -eq 0 ]; then