diff options
| author | Florian Haas <florian.haas@...> | 2010-05-11 17:47:48 +0200 |
|---|---|---|
| committer | Florian Haas <florian.haas@...> | 2010-05-11 17:47:48 +0200 |
| commit | df2985bda7e3272c23ae9557aeddc1811c39fef2 (patch) | |
| tree | 6e2506e354d089748967642669c26236dd05c049 | |
| parent | e3cd2871a2624f4e3394cb1a7a7883a71f658a5d (diff) | |
| download | rabbitmq-server-df2985bda7e3272c23ae9557aeddc1811c39fef2.tar.gz | |
OCF resource agent: use ocf_is_probe
Linux-HA comes with the ocf_is_probe function to determine whether a
probe operation is in progress. Use this to determine whether to do
full or partial validation.
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index dcf07987..0fb5dbc2 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -259,12 +259,6 @@ rabbit_status() { rabbit_start() { local rc - rabbit_validate_full - rc=$? - if [ "$rc" != $OCF_SUCCESS ]; then - return $rc - fi - export_vars $RABBITMQ_MULTI start_all 1 > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err & @@ -339,7 +333,11 @@ case $__OCF_ACTION in ;; esac -rabbit_validate_partial || exit +if ocf_is_probe; then + rabbit_validate_partial || exit +else + rabbit_validate_full || exit +fi case $__OCF_ACTION in start) |