diff options
author | Jean-S?bastien P?dron <jean-sebastien@rabbitmq.com> | 2014-11-20 09:45:37 +0100 |
---|---|---|
committer | Jean-S?bastien P?dron <jean-sebastien@rabbitmq.com> | 2014-11-20 09:45:37 +0100 |
commit | a416ba84b97459952c2467cf0cdea0b76b6bf241 (patch) | |
tree | 1995abbb1df14e46a18faecbbb7d659bb43006f2 | |
parent | 2350dd961bfde5601b439a574c7eef94d090aa04 (diff) | |
download | rabbitmq-server-a416ba84b97459952c2467cf0cdea0b76b6bf241.tar.gz |
Remove support for the legacy 'cluster_nodes' values
Before this change, a list of nodes without the node type was accepted.
In this case, the node type was guessed and a warning suggesting how to
update the configuration was logged.
Now, the node type is mandatory and the RabbitMQ server refuses to start
if the node type is unspecified.
-rw-r--r-- | src/rabbit_mnesia.erl | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index fa51dd70..d3cacb17 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -116,18 +116,9 @@ init_from_config() -> {TryNodes, NodeType} = case application:get_env(rabbit, cluster_nodes) of {ok, Nodes} when is_list(Nodes) -> - Config = {Nodes -- [node()], case lists:member(node(), Nodes) of - true -> disc; - false -> ram - end}, - rabbit_log:warning( - "Converting legacy 'cluster_nodes' configuration~n ~w~n" - "to~n ~w.~n~n" - "Please update the configuration to the new format " - "{Nodes, NodeType}, where Nodes contains the nodes that the " - "node will try to cluster with, and NodeType is either " - "'disc' or 'ram'~n", [Nodes, Config]), - Config; + %% The legacy syntax (a nodes list without the node + %% type) is unsupported. + e(cluster_node_type_mandatory); {ok, Config} -> Config end, @@ -865,4 +856,7 @@ error_description(removing_node_from_offline_node) -> "To remove a node remotely from an offline node, the node you are removing " "from must be a disc node and all the other nodes must be offline."; error_description(no_running_cluster_nodes) -> - "You cannot leave a cluster if no online nodes are present.". + "You cannot leave a cluster if no online nodes are present."; +error_description(cluster_node_type_mandatory) -> + "The 'cluster_nodes' configuration key must indicate the node type: " + "either {[...], disc} or {[...], ram}". |