diff options
| author | Alexey Lebedeff <alebedev@mirantis.com> | 2016-04-04 19:33:25 +0300 |
|---|---|---|
| committer | Alexey Lebedeff <alebedev@mirantis.com> | 2016-04-04 19:33:25 +0300 |
| commit | c45b4c30e1836a6cbec6cd86a13143305eb14ba1 (patch) | |
| tree | e0d51a9474a4f9062f6cfd973e090d5491942cec /scripts | |
| parent | 41ce5ad808863944cd6d62ce7f7e2271f1010582 (diff) | |
| download | rabbitmq-server-git-c45b4c30e1836a6cbec6cd86a13143305eb14ba1.tar.gz | |
Fix half-hearted attempt to erase mnesia in OCF RA
ocf_run does `"$@"`, so "${MNESIA_FILES}/*" wasn't expanded and mnesia
directory wasn't actually cleaned up
Fuel bug: https://bugs.launchpad.net/fuel/+bug/1565868
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index ae7991833b..5ead9a81ad 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 |