diff options
| author | Alexey Lebedeff <binarin@gmail.com> | 2016-01-20 17:14:38 +0300 |
|---|---|---|
| committer | Alexey Lebedeff <binarin@gmail.com> | 2016-01-20 17:14:38 +0300 |
| commit | 3108dabf61a6c469a38e3c8079a27db2ba2501c5 (patch) | |
| tree | 248f18225a9bd8bbe82c077be1b6e5bf6e08c138 /scripts | |
| parent | e78bc2d9b792678d1ebdb09f30ee06fe58d39719 (diff) | |
| download | rabbitmq-server-git-3108dabf61a6c469a38e3c8079a27db2ba2501c5.tar.gz | |
Improve 'list_channels' diagnostics in OCF
timeout(1) manpage mentions 124 as another valid return code from, in addition to 128 + signal-number.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index fa439a244e..debe19443d 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -1501,7 +1501,7 @@ get_monitor() { local timeout_alive su_rabbit_cmd "${OCF_RESKEY_ctl} list_channels 2>&1 > /dev/null" rc_alive=$? - [ $rc_alive -eq 137 ] && ocf_log err "${LH} 'rabbitmqctl list_channels' timed out, per-node explanation: $(enhanced_list_channels)" + [ $rc_alive -eq 137 -o $rc_alive -eq 124 ] && ocf_log err "${LH} 'rabbitmqctl list_channels' timed out, per-node explanation: $(enhanced_list_channels)" check_timeouts $rc_alive "rabbit_list_channels_timeouts" "list_channels" timeout_alive=$? |