diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-10-14 16:11:51 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-10-14 16:11:51 +0300 |
| commit | aea0de2788070dc5ea08bb9d1835850b1d71b15f (patch) | |
| tree | 868a369d59697d772d0dcbdd4f54b96b4fcb97db | |
| parent | 2cdf0c174217970ba6912de225f1b19229948964 (diff) | |
| parent | 9b2566d5e8f2b869a88cb8d9a1b9e9158c749587 (diff) | |
| download | rabbitmq-server-git-aea0de2788070dc5ea08bb9d1835850b1d71b15f.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_nodes.erl | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index b8997faea5..849efa3611 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -287,10 +287,10 @@ promote_slave([SPid | SPids]) -> {SPid, SPids}. initial_queue_node(Q, DefNode) -> - {MNode, _SNodes} = suggested_queue_nodes(Q, DefNode, all_nodes()), + {MNode, _SNodes} = suggested_queue_nodes(Q, DefNode, rabbit_nodes:all_running()), MNode. -suggested_queue_nodes(Q) -> suggested_queue_nodes(Q, all_nodes()). +suggested_queue_nodes(Q) -> suggested_queue_nodes(Q, rabbit_nodes:all_running()). suggested_queue_nodes(Q, All) -> suggested_queue_nodes(Q, node(), All). %% The third argument exists so we can pull a call to @@ -312,8 +312,6 @@ suggested_queue_nodes(Q = #amqqueue{exclusive_owner = Owner}, DefNode, All) -> _ -> {MNode, []} end. -all_nodes() -> rabbit_mnesia:cluster_nodes(running). - policy(Policy, Q) -> case rabbit_policy:get(Policy, Q) of undefined -> none; diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index 090aacc63c..57d971715b 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -18,7 +18,8 @@ -export([names/1, diagnostics/1, make/1, parts/1, cookie_hash/0, is_running/2, is_process_running/2, - cluster_name/0, set_cluster_name/1, ensure_epmd/0]). + cluster_name/0, set_cluster_name/1, ensure_epmd/0, + all_running/0]). -include_lib("kernel/include/inet.hrl"). @@ -42,6 +43,7 @@ -spec(cluster_name/0 :: () -> binary()). -spec(set_cluster_name/1 :: (binary()) -> 'ok'). -spec(ensure_epmd/0 :: () -> 'ok'). +-spec(all_running/0 :: () -> [node()]). -endif. @@ -215,3 +217,5 @@ port_shutdown_loop(Port) -> {Port, {exit_status, _Rc}} -> ok; {Port, _} -> port_shutdown_loop(Port) end. + +all_running() -> rabbit_mnesia:cluster_nodes(running). |