diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-05-21 13:17:57 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-05-21 13:17:57 +0100 |
| commit | 26a98ace5311e26f2a26122d4f1754d33a1b6723 (patch) | |
| tree | d4826597453b9e0fb7a3cdb91bb577aa69fc156d | |
| parent | 9691cb24a5014c7f25c12c5cfa08a127eb1529ff (diff) | |
| download | rabbitmq-server-git-26a98ace5311e26f2a26122d4f1754d33a1b6723.tar.gz | |
No, that broke upgrades on RAM nodes. Third time's the charm...
| -rw-r--r-- | src/rabbit_mnesia.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 8cd976faa4..6ea9108644 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -465,10 +465,11 @@ init_db_and_upgrade(ClusterNodes, NodeType, CheckOtherNodes) -> %% about the cluster case NodeType of ram -> start_mnesia(), - change_extra_db_nodes(ClusterNodes, false), - rabbit_table:wait_for_replicated(); + change_extra_db_nodes(ClusterNodes, false); disc -> ok end, + %% ...and all nodes will need to wait for tables + rabbit_table:wait_for_replicated(), ok. init_db_with_mnesia(ClusterNodes, NodeType, diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index b9f25ef1a0..fde0dbe131 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -238,7 +238,6 @@ maybe_upgrade_local() -> ok = apply_upgrades(local, Upgrades, fun () -> ok end), ensure_backup_removed(), - rabbit_table:wait_for_replicated(), ok end. |