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 | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index 7492eb82f3..ae39effa2c 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -434,7 +434,7 @@ <varlistentry> <term> <cmdsynopsis> - <command>recluster</command> + <command>update_cluster_nodes</command> <arg choice="req">clusternode</arg> </cmdsynopsis> </term> @@ -444,7 +444,7 @@ <term>clusternode</term> <listitem> <para> - The node to recluster with. + The node to update_cluster_nodes with. </para> </listitem> </varlistentry> @@ -462,7 +462,7 @@ which node A and B are clustered. A goes down, C clusters with C, and then B leaves the cluster. When A wakes up, it'll try to contact B, but this will fail since B is not in the cluster - anymore. <command>recluster -n A C</command> will solve this + anymore. <command>update_cluster_nodes -n A C</command> will solve this situation. </para> </listitem> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index b92493e3e6..c58c8eee77 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -47,7 +47,7 @@ {join_cluster, [?RAM_DEF]}, change_cluster_node_type, - recluster, + update_cluster_nodes, {remove_cluster_node, [?OFFLINE_DEF]}, cluster_status, @@ -259,10 +259,10 @@ action(change_cluster_node_type, Node, [Type], _Opts, Inform) Inform("Turning ~p into a disc node", [Node]), rpc_call(Node, rabbit_mnesia, change_cluster_node_type, [disc]); -action(recluster, Node, [ClusterNodeS], _Opts, Inform) -> +action(update_cluster_nodes, Node, [ClusterNodeS], _Opts, Inform) -> ClusterNode = list_to_atom(ClusterNodeS), Inform("Re-clustering ~p with ~p", [Node, ClusterNode]), - rpc_call(Node, rabbit_mnesia, recluster, [ClusterNode]); + rpc_call(Node, rabbit_mnesia, update_cluster_nodes, [ClusterNode]); action(remove_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> ClusterNode = list_to_atom(ClusterNodeS), diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 6aade1dae4..d839dd7a39 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -22,7 +22,7 @@ join_cluster/2, reset/0, force_reset/0, - recluster/1, + update_cluster_nodes/1, change_cluster_node_type/1, remove_cluster_node/2, @@ -75,7 +75,7 @@ -spec(join_cluster/2 :: ([node()], boolean()) -> 'ok'). -spec(reset/0 :: () -> 'ok'). -spec(force_reset/0 :: () -> 'ok'). --spec(recluster/1 :: (node()) -> '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'). @@ -152,8 +152,8 @@ join_cluster(DiscoveryNode, WantDiscNode) -> {standalone_ram_node, "You can't cluster a node if it's the only " "disc node in its existing cluster. If new nodes " - "joined while this node was offline, use \"recluster\" " - "to add them manually"}}); + "joined while this node was offline, use " + "\"update_cluster_nodes\" to add them manually"}}); _ -> ok end, @@ -254,8 +254,8 @@ change_cluster_node_type(Type) -> {cannot_connect_to_cluster, "Could not connect to the cluster nodes present in " "this node status file. If the cluster has changed, " - "you can use the \"recluster\" command to point to the " - "new cluster nodes"}}) + "you can use the \"update_cluster_nodes\" command to " + "point to the new cluster nodes"}}) end, WantDiscNode = case Type of ram -> false; @@ -271,7 +271,7 @@ change_cluster_node_type(Type) -> end, ok = init_db_with_mnesia(AllNodes, WantDiscNode, false). -recluster(DiscoveryNode) -> +update_cluster_nodes(DiscoveryNode) -> ensure_mnesia_not_running(), ensure_mnesia_dir(), |