diff options
| author | Dmitry Mescheryakov <dmescheryakov@mirantis.com> | 2016-09-06 17:53:08 +0300 |
|---|---|---|
| committer | Dmitry Mescheryakov <dmescheryakov@mirantis.com> | 2016-09-06 17:58:15 +0300 |
| commit | 7fd8dcf68f1fa50bf8092df83f1884b4fa206697 (patch) | |
| tree | a2dd5f5fa96080461dedf0ca83a3fe14a03562a0 | |
| parent | f8371f775321ec5a0e15776bfa1d0072c9732c84 (diff) | |
| download | rabbitmq-server-git-7fd8dcf68f1fa50bf8092df83f1884b4fa206697.tar.gz | |
[OCF HA] Do not suggest to run the second monitor action
Right now we suggest to users to run the second monitor for slaves
with depth=30. It made sense previously, when there was an additional
check at that depth. Right now we don't have any depth-specific
checks and hence it does not make sense to run the second monitor.
Moreover, removing the second monitor fixes an issue with Pacemaker
not reacting on failing monitor if it takes more than a minute. For
details see Fuel bug https://launchpad.net/bugs/1618843
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index c74525c936..63e5f700d9 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -332,7 +332,6 @@ $EXTENDED_OCF_PARAMS <action name="status" timeout="20" /> <action name="monitor" depth="0" timeout="30" interval="5" /> <action name="monitor" depth="0" timeout="30" interval="3" role="Master"/> -<action name="monitor" depth="30" timeout="60" interval="103" /> <action name="promote" timeout="30" /> <action name="demote" timeout="30" /> <action name="notify" timeout="20" /> |