add the magic `cluster' word to `remove_node' and `change_node_type'

2 files changed, 15 insertions, 15 deletions

diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 4011709a..f3000f17 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -46,9 +46,9 @@
          rotate_logs,
 
          {join_cluster, [?RAM_DEF]},
-         change_node_type,
+         change_cluster_node_type,
          recluster,
-         {remove_node, [?OFFLINE_DEF]},
+         {remove_cluster_node, [?OFFLINE_DEF]},
          cluster_status,
 
          add_user,
@@ -251,23 +251,23 @@ action(join_cluster, Node, [ClusterNodeS], Opts, Inform) ->
     Inform("Clustering node ~p with ~p", [Node, ClusterNode]),
     rpc_call(Node, rabbit_mnesia, join_cluster, [ClusterNode, DiscNode]);
 
-action(change_node_type, Node, ["ram"], _Opts, Inform) ->
+action(change_cluster_node_type, Node, ["ram"], _Opts, Inform) ->
     Inform("Turning ~p into a ram node", [Node]),
-    rpc_call(Node, rabbit_mnesia, change_node_type, [ram]);
-action(change_node_type, Node, ["disc"], _Opts, Inform) ->
+    rpc_call(Node, rabbit_mnesia, change_cluster_node_type, [ram]);
+action(change_cluster_node_type, Node, ["disc"], _Opts, Inform) ->
     Inform("Turning ~p into a disc node", [Node]),
-    rpc_call(Node, rabbit_mnesia, change_node_type, [disc]);
+    rpc_call(Node, rabbit_mnesia, change_cluster_node_type, [disc]);
 
 action(recluster, Node, [ClusterNodeS], _Opts, Inform) ->
     ClusterNode = list_to_atom(ClusterNodeS),
     Inform("Re-clustering ~p with ~p", [Node, ClusterNode]),
     rpc_call(Node, rabbit_mnesia, recluster, [ClusterNode]);
 
-action(remove_node, Node, [ClusterNodeS], Opts, Inform) ->
+action(remove_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_node,
+    rpc_call(Node, rabbit_mnesia, remove_cluster_node,
              [ClusterNode, RemoveWhenOffline]);
 
 action(wait, Node, [PidFile], _Opts, Inform) ->
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 9aec2092..3d5af048 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -23,8 +23,8 @@
          reset/0,
          force_reset/0,
          recluster/1,
-         change_node_type/1,
-         remove_node/2,
+         change_cluster_node_type/1,
+         remove_cluster_node/2,
 
          status/0,
          is_db_empty/0,
@@ -76,8 +76,8 @@
 -spec(reset/0 :: () -> 'ok').
 -spec(force_reset/0 :: () -> 'ok').
 -spec(recluster/1 :: (node()) -> 'ok').
--spec(change_node_type/1 :: (node_type()) -> 'ok').
--spec(remove_node/2 :: (node(), boolean()) -> 'ok').
+-spec(change_cluster_node_type/1 :: (node_type()) -> 'ok').
+-spec(remove_cluster_node/2 :: (node(), boolean()) -> 'ok').
 
 %% Various queries to get the status of the db
 -spec(status/0 :: () -> [{'nodes', [{node_type(), [node()]}]} |
@@ -234,7 +234,7 @@ reset(Force) ->
     ok = rabbit_node_monitor:reset_cluster_status_file(),
     ok.
 
-change_node_type(Type) ->
+change_cluster_node_type(Type) ->
     ensure_mnesia_dir(),
     ensure_mnesia_not_running(),
     case is_clustered() of
@@ -302,7 +302,7 @@ recluster(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_node(Node, RemoveWhenOffline) ->
+remove_cluster_node(Node, RemoveWhenOffline) ->
     case ordsets:is_element(Node, all_clustered_nodes()) of
         true  -> ok;
         false -> throw({error, {not_a_cluster_node,
@@ -354,7 +354,7 @@ remove_node_offline_node(Node) ->
                       try
                           [mnesia:force_load_table(T) ||
                               T <- rabbit_mnesia:table_names()],
-                          remove_node(Node, false),
+                          remove_cluster_node(Node, false),
                           ensure_mnesia_running()
                       after
                           stop_mnesia()