summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-01-20 15:29:18 +0300
committerMichael Klishin <michael@novemberain.com>2016-01-20 15:29:18 +0300
commitafd30fb0a1739ab8d6c027416ce9ea146a02eb2c (patch)
tree3f91a7461dc92a7dfe07bd999fb22ca2d5d82013 /scripts
parent6f6825a07440f7272f37bbd47dd445de631c9787 (diff)
parent9846fbf5d31997076b46c4735899157d12c7c69c (diff)
downloadrabbitmq-server-git-afd30fb0a1739ab8d6c027416ce9ea146a02eb2c.tar.gz
Merge pull request #560 from dmitrymex/reset-master-score
Reset master score if we decide to restart RabbitMQ on timeout
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