diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-12-09 10:32:11 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-12-09 10:32:11 +0000 |
commit | 26cb34870e9681e7cf5addea5942228d80c0d977 (patch) | |
tree | 8a390fd5165e8d095eda9d0f24a78872b9ec69e9 | |
parent | 90d553d02219327a54bb90a6a2e03356cecdedb5 (diff) | |
download | rabbitmq-server-26cb34870e9681e7cf5addea5942228d80c0d977.tar.gz |
Fail clearly if the node specified with '-n' is not a member of the cluster before or after.
-rw-r--r-- | src/rabbit_mnesia_rename.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_mnesia_rename.erl b/src/rabbit_mnesia_rename.erl index d93f8ea3..9ef8aedd 100644 --- a/src/rabbit_mnesia_rename.erl +++ b/src/rabbit_mnesia_rename.erl @@ -53,10 +53,12 @@ rename(Node, NodeMapList) -> rabbit_control_main:become(FromNode), start_mnesia(), Nodes = rabbit_mnesia:cluster_nodes(all), - case {FromNodes -- Nodes, ToNodes -- (ToNodes -- Nodes)} of - {[], []} -> ok; - {F, []} -> exit({nodes_not_in_cluster, F}); - {_, T} -> exit({nodes_already_in_cluster, T}) + case {FromNodes -- Nodes, ToNodes -- (ToNodes -- Nodes), + lists:member(Node, Nodes ++ ToNodes)} of + {[], [], true} -> ok; + {[], [], false} -> exit({i_am_not_involved, Node}); + {F, [], _} -> exit({nodes_not_in_cluster, F}); + {_, T, _} -> exit({nodes_already_in_cluster, T}) end, rabbit_table:force_load(), rabbit_table:wait_for_replicated(), |