summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl1
-rw-r--r--src/rabbit_upgrade.erl3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 5f88b9972d..1361d0f4ce 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -233,6 +233,7 @@ rotate_logs(BinarySuffix) ->
start(normal, []) ->
case erts_version_check() of
ok ->
+ ok = rabbit_mnesia:delete_previously_running_disc_nodes(),
{ok, SupPid} = rabbit_sup:start_link(),
true = register(rabbit, self()),
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index b4e1191e51..20f53da236 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -112,8 +112,7 @@ maybe_upgrade_mnesia() ->
primary -> primary_upgrade(Upgrades, AllNodes);
secondary -> secondary_upgrade(AllNodes)
end
- end,
- ok = rabbit_mnesia:delete_previously_running_disc_nodes().
+ end.
upgrade_mode(AllNodes) ->
case nodes_running(AllNodes) of