Skip to content

Commit 0a63f08

Browse files
lukebakkenmichaelklishin
authored andcommitted
Add timeout to rpc:multicall usage
Fixes #2437 Dependencies: * rabbitmq/rabbitmq-common#410 * rabbitmq/rabbitmq-management-agent#96 (cherry picked from commit 201116b)
1 parent d38886e commit 0a63f08

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/rabbit_channel.erl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242

4343
-include_lib("rabbit_common/include/rabbit_framing.hrl").
4444
-include_lib("rabbit_common/include/rabbit.hrl").
45+
-include_lib("rabbit_common/include/rabbit_misc.hrl").
46+
4547
-include("amqqueue.hrl").
4648

4749
-behaviour(gen_server2).
@@ -352,8 +354,9 @@ send_drained(Pid, CTagCredit) ->
352354
-spec list() -> [pid()].
353355

354356
list() ->
355-
rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running),
356-
rabbit_channel, list_local, []).
357+
Running = rabbit_mnesia:cluster_nodes(running),
358+
rabbit_misc:append_rpc_all_nodes(Running,
359+
rabbit_channel, list_local, [], ?RPC_TIMEOUT).
357360

358361
-spec list_local() -> [pid()].
359362

src/rabbit_direct.erl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-export([extract_extra_auth_props/4]).
2020

2121
-include("rabbit.hrl").
22+
-include("rabbit_misc.hrl").
2223

2324
%%----------------------------------------------------------------------------
2425

@@ -43,8 +44,9 @@ list_local() ->
4344
-spec list() -> [pid()].
4445

4546
list() ->
46-
rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running),
47-
rabbit_direct, list_local, []).
47+
Running = rabbit_mnesia:cluster_nodes(running),
48+
rabbit_misc:append_rpc_all_nodes(Running,
49+
rabbit_direct, list_local, [], ?RPC_TIMEOUT).
4850

4951
%%----------------------------------------------------------------------------
5052

src/rabbit_networking.erl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
]).
4848

4949
-include("rabbit.hrl").
50+
-include("rabbit_misc.hrl").
5051

5152
%% IANA-suggested ephemeral port range is 49152 to 65535
5253
-define(FIRST_TEST_BIND_PORT, 49152).
@@ -384,8 +385,9 @@ unregister_connection(Pid) -> pg_local:leave(rabbit_connections, Pid).
384385
-spec connections() -> [rabbit_types:connection()].
385386

386387
connections() ->
387-
rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running),
388-
rabbit_networking, connections_local, []).
388+
Running = rabbit_mnesia:cluster_nodes(running),
389+
rabbit_misc:append_rpc_all_nodes(Running,
390+
rabbit_networking, connections_local, [], ?RPC_TIMEOUT).
389391

390392
-spec local_connections() -> [rabbit_types:connection()].
391393
%% @doc Returns pids of AMQP 0-9-1 and AMQP 1.0 connections local to this node.

0 commit comments

Comments
 (0)