diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-04-18 16:02:57 -0700 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-04-18 16:02:57 -0700 |
| commit | cc258d7a04d336883c12277b1a432f8c9a630e35 (patch) | |
| tree | 2231bc0e92b2cc0f61c5037e9b399865a642bff5 /scripts/rabbitmq-server-ha.ocf | |
| parent | e5724d797f18aec8ab86b9a4054e1183a5bc063f (diff) | |
| parent | 57c4a7af72268b8cf88efd2ec774616dd14aa31f (diff) | |
| download | rabbitmq-server-git-cc258d7a04d336883c12277b1a432f8c9a630e35.tar.gz | |
Merge branch 'stable' into rabbitmq-server-698
Diffstat (limited to 'scripts/rabbitmq-server-ha.ocf')
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index ae7991833b..301f7a1fc7 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -678,8 +678,8 @@ reset_mnesia() { # remove mnesia files, if required if $make_amnesia ; then kill_rmq_and_remove_pid - ocf_run rm -rf "${MNESIA_FILES}/*" - ocf_log warn "${LH} Mnesia files appear corrupted and have been removed." + ocf_run rm -rf "${MNESIA_FILES}" + ocf_log warn "${LH} Mnesia files appear corrupted and have been removed from ${MNESIA_FILES}." fi # always return OCF SUCCESS return $OCF_SUCCESS @@ -1479,6 +1479,7 @@ get_monitor() { if [ -n "$master_name" ]; then ocf_log info "${LH} master exists and rabbit app is not running. Exiting to be restarted by pacemaker" + stop_server_process rc=$OCF_ERR_GENERIC fi fi |