openstack
/
fuel-library
Code Issues Proposed changes

Fix half-hearted attempt to erase mnesia in OCF RA 

Cherry-picked from master (6e1d58557d)

ocf_run does $("$@"), so "${MNESIA_FILES}/*" wasn't expanded and mnesia
directory wasn't actually cleaned up

It's safe to remove that directory completely - it will be re-created
automatically by mnesia.

Upstream https://github.com/rabbitmq/rabbitmq-server/pull/724

Change-Id: I0aa47f61e03c99ee6ebb56b833463cdf4ccd243e
Closes-Bug: 1565868
This commit is contained in:
Alexey Lebedeff 2016-04-04 19:44:09 +03:00 committed by Alexey Lebedev
parent c4d3dfc9c0
commit a2d9314432
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/fuel-ha-utils/ocf/rabbitmq
View File

@ -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