summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-05-21 12:24:22 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-05-21 12:24:22 +0100
commitd7f3b76387a93c466b2495cc1fcf84f7c62f3d8d (patch)
tree31670d00a642e42507143d920c0352f7dd5163fe
parent9c83a7408fad5844e1e0f5aa9e9397978bc77125 (diff)
downloadrabbitmq-server-d7f3b76387a93c466b2495cc1fcf84f7c62f3d8d.tar.gz
Only wait for tables once local upgrades are over, not mnesia ones.
-rw-r--r--src/rabbit_upgrade.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl
index cffd6ae0..b9f25ef1 100644
--- a/src/rabbit_upgrade.erl
+++ b/src/rabbit_upgrade.erl
@@ -238,6 +238,7 @@ maybe_upgrade_local() ->
ok = apply_upgrades(local, Upgrades,
fun () -> ok end),
ensure_backup_removed(),
+ rabbit_table:wait_for_replicated(),
ok
end.
@@ -247,7 +248,6 @@ apply_upgrades(Scope, Upgrades, Fun) ->
ok = rabbit_file:lock_file(lock_filename()),
info("~s upgrades: ~w to apply~n", [Scope, length(Upgrades)]),
rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia),
- rabbit_table:wait_for_replicated(),
Fun(),
[apply_upgrade(Scope, Upgrade) || Upgrade <- Upgrades],
info("~s upgrades: All upgrades applied successfully~n", [Scope]),