diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 17:38:36 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-24 17:38:36 +0100 |
| commit | 04870f6a91abf989ec781fe5de1e0c93bb381488 (patch) | |
| tree | d292e0a7adab145914ccec27c522ce50c1a74459 | |
| parent | 0f0df649626d1f33e4a7f451a345ccbbde599b99 (diff) | |
| download | rabbitmq-server-04870f6a91abf989ec781fe5de1e0c93bb381488.tar.gz | |
improve workingness
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_direct.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 11 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index e50e823c..c0bad4fa 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -136,7 +136,7 @@ flushed(Pid, QPid) -> gen_server2:cast(Pid, {flushed, QPid}). list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:running_clustered_nodes(), + rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running), rabbit_channel, list_local, []). list_local() -> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index a6c4fe67..e75e1f6f 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -461,7 +461,7 @@ action(list_parameters, Node, [], Opts, Inform) -> action(report, Node, _Args, _Opts, Inform) -> Inform("Reporting server status on ~p~n~n", [erlang:universaltime()]), [begin ok = action(Action, N, [], [], Inform), io:nl() end || - N <- unsafe_rpc(Node, rabbit_mnesia, running_clustered_nodes, []), + N <- unsafe_rpc(Node, rabbit_mnesia, cluster_nodes, [running]), Action <- [status, cluster_status, environment]], VHosts = unsafe_rpc(Node, rabbit_vhost, list, []), [print_report(Node, Q) || Q <- ?GLOBAL_QUERIES], diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index a669a2b3..758b37d1 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -59,7 +59,7 @@ list_local() -> pg_local:get_members(rabbit_direct). list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:running_clustered_nodes(), + rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running), rabbit_direct, list_local, []). %%---------------------------------------------------------------------------- diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index c11a8ff7..41389815 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -87,12 +87,11 @@ init(#amqqueue { name = QName, mirror_nodes = MNodes } = Q, Recover, {ok, CPid} = rabbit_mirror_queue_coordinator:start_link( Q, undefined, sender_death_fun(), length_fun()), GM = rabbit_mirror_queue_coordinator:get_gm(CPid), - MNodes1 = - (case MNodes of - all -> rabbit_mnesia:all_clustered_nodes(); - undefined -> []; - _ -> MNodes - end) -- [node()], + MNodes1 = (case MNodes of + all -> rabbit_mnesia:cluster_nodes(all); + undefined -> []; + _ -> MNodes + end) -- [node()], [rabbit_mirror_queue_misc:add_mirror(QName, Node) || Node <- MNodes1], {ok, BQ} = application:get_env(backing_queue_module), BQS = BQ:init(Q, Recover, AsyncCallback), |