diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 6 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index ac73e84a8b..c74ec785a4 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -336,7 +336,7 @@ <para> To leave a cluster, <command>reset</command> the node. You can also remove nodes remotely with the - <command>remove_cluster_node</command> command. + <command>forget_cluster_node</command> command. </para> <para> For more details see the <ulink @@ -394,7 +394,7 @@ <varlistentry> <term> <cmdsynopsis> - <command>remove_cluster_node</command> + <command>forget_cluster_node</command> <arg choice="opt">--offline</arg> </cmdsynopsis> </term> @@ -420,7 +420,7 @@ online, except when using the <command>--offline</command> flag. </para> <para role="example-prefix">For example:</para> - <screen role="example">rabbitmqctl -n hare@mcnulty remove_cluster_node rabbit@stringer</screen> + <screen role="example">rabbitmqctl -n hare@mcnulty forget_cluster_node rabbit@stringer</screen> <para role="example"> This command will remove the node <command>rabbit@stringer</command> from the node diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index c58c8eee77..0caa5be686 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -48,7 +48,7 @@ {join_cluster, [?RAM_DEF]}, change_cluster_node_type, update_cluster_nodes, - {remove_cluster_node, [?OFFLINE_DEF]}, + {forget_cluster_node, [?OFFLINE_DEF]}, cluster_status, add_user, @@ -264,11 +264,11 @@ action(update_cluster_nodes, Node, [ClusterNodeS], _Opts, Inform) -> Inform("Re-clustering ~p with ~p", [Node, ClusterNode]), rpc_call(Node, rabbit_mnesia, update_cluster_nodes, [ClusterNode]); -action(remove_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> +action(forget_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> ClusterNode = list_to_atom(ClusterNodeS), RemoveWhenOffline = proplists:get_bool(?OFFLINE_OPT, Opts), Inform("Removing node ~p from cluster", [ClusterNode]), - rpc_call(Node, rabbit_mnesia, remove_cluster_node, + rpc_call(Node, rabbit_mnesia, forget_cluster_node, [ClusterNode, RemoveWhenOffline]); action(wait, Node, [PidFile], _Opts, Inform) -> diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index d839dd7a39..7c2a88cb94 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -24,7 +24,7 @@ force_reset/0, update_cluster_nodes/1, change_cluster_node_type/1, - remove_cluster_node/2, + forget_cluster_node/2, status/0, is_db_empty/0, @@ -77,7 +77,7 @@ -spec(force_reset/0 :: () -> 'ok'). -spec(update_cluster_nodes/1 :: (node()) -> 'ok'). -spec(change_cluster_node_type/1 :: (node_type()) -> 'ok'). --spec(remove_cluster_node/2 :: (node(), boolean()) -> 'ok'). +-spec(forget_cluster_node/2 :: (node(), boolean()) -> 'ok'). %% Various queries to get the status of the db -spec(status/0 :: () -> [{'nodes', [{node_type(), [node()]}]} | @@ -304,7 +304,7 @@ update_cluster_nodes(DiscoveryNode) -> %% * All other nodes are offline %% * This node was, at the best of our knowledge (see comment below) the last %% or second to last after the node we're removing to go down -remove_cluster_node(Node, RemoveWhenOffline) -> +forget_cluster_node(Node, RemoveWhenOffline) -> case ordsets:is_element(Node, all_clustered_nodes()) of true -> ok; false -> throw({error, {not_a_cluster_node, @@ -356,7 +356,7 @@ remove_node_offline_node(Node) -> try [mnesia:force_load_table(T) || T <- rabbit_mnesia:table_names()], - remove_cluster_node(Node, false), + forget_cluster_node(Node, false), ensure_mnesia_running() after stop_mnesia() |