diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 14:03:49 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 14:03:49 +0000 |
| commit | e45219e2eea0ef94646518a122dedf6f39fadc2f (patch) | |
| tree | 19444ae466843fbd8e9130560012538012f40d80 /src/rabbit_upgrade.erl | |
| parent | 3821445acd31339a98af2ab0508f092ec06332d2 (diff) | |
| download | rabbitmq-server-e45219e2eea0ef94646518a122dedf6f39fadc2f.tar.gz | |
Break the bad news rather than just timing out wait_for_tables as we traditionally have done.
Diffstat (limited to 'src/rabbit_upgrade.erl')
| -rw-r--r-- | src/rabbit_upgrade.erl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 2c4dad87..53ed99d3 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -52,9 +52,9 @@ maybe_upgrade_mnesia() -> rabbit:prepare(), + Nodes = rabbit_mnesia:all_clustered_nodes(), case upgrades_required(mnesia) of [_|_] = Upgrades -> - Nodes = rabbit_mnesia:all_clustered_nodes(), case am_i_upgrader(Nodes) of true -> primary_upgrade(Upgrades, Nodes); false -> non_primary_upgrade(Nodes) @@ -62,7 +62,15 @@ maybe_upgrade_mnesia() -> [] -> ok; version_not_available -> - ok + case Nodes of + [_] -> + ok; + _ -> + die("Cluster upgrade needed but upgrading from < 2.1.1.~n" + " Unfortunately you will need to rebuild the " + "cluster.", + []) + end end. am_i_upgrader(Nodes) -> |