diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-03-23 16:05:04 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-03-23 16:05:04 +0000 |
| commit | c63dcaa034093cd1dc217c06c102127d18ac524f (patch) | |
| tree | e13a0a7645195e2c306bff3936aef441093eb109 /src/rabbit_upgrade.erl | |
| parent | 49025c80d9eb23f59615f6a92522d48aee5bbd3a (diff) | |
| download | rabbitmq-server-c63dcaa034093cd1dc217c06c102127d18ac524f.tar.gz | |
Record all nodes, don't list them when we refuse to start.
Diffstat (limited to 'src/rabbit_upgrade.erl')
| -rw-r--r-- | src/rabbit_upgrade.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 6959208b..244be522 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -144,7 +144,7 @@ maybe_upgrade_mnesia() -> upgrade_mode(AllNodes) -> case nodes_running(AllNodes) of [] -> - AfterUs = rabbit_mnesia:read_previously_running_disc_nodes(), + AfterUs = rabbit_mnesia:read_previously_running_nodes(), case {is_disc_node(), AfterUs} of {true, []} -> primary; @@ -152,14 +152,11 @@ upgrade_mode(AllNodes) -> Filename = rabbit_mnesia:running_nodes_filename(), die("Cluster upgrade needed but other disc nodes shut " "down after this one.~nPlease first start the last " - "disc node to shut down.~nThe disc nodes that were " - "still running when this one shut down are:~n~n" - " ~p~n~nNote: if several disc nodes were shut down " - "simultaneously they may all~nshow this message. " - "In which case, remove the lock file on one of them " - "and~nstart that node. The lock file on this node " - "is:~n~n ~s ", - [AfterUs, Filename]); + "disc node to shut down.~n~nNote: if several disc " + "nodes were shut down simultaneously they may " + "all~nshow this message. In which case, remove " + "the lock file on one of them and~nstart that node. " + "The lock file on this node is:~n~n ~s ", [Filename]); {false, _} -> die("Cluster upgrade needed but this is a ram node.~n" "Please first start the last disc node to shut down.", |