diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-08-28 11:38:13 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2020-08-28 11:38:13 -0700 |
| commit | 201116bc330c5eb191397c9bafe4cffef95c1dcd (patch) | |
| tree | 3e096b039768450dc4e1916d47eea6ce4c0deb1a | |
| parent | 716d293e0dfc727700dfb93be64081c5cbf6dd5a (diff) | |
| download | rabbitmq-server-git-201116bc330c5eb191397c9bafe4cffef95c1dcd.tar.gz | |
Add timeout to rpc:multicall usage
Fixes #2437
Dependencies:
* rabbitmq/rabbitmq-common#410
* rabbitmq/rabbitmq-management-agent#96
| -rw-r--r-- | src/rabbit_channel.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_direct.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index e57dfb686c..9a56e70db8 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -42,6 +42,8 @@ -include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). +-include_lib("rabbit_common/include/rabbit_misc.hrl"). + -include("amqqueue.hrl"). -behaviour(gen_server2). @@ -352,8 +354,9 @@ send_drained(Pid, CTagCredit) -> -spec list() -> [pid()]. list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running), - rabbit_channel, list_local, []). + Running = rabbit_mnesia:cluster_nodes(running), + rabbit_misc:append_rpc_all_nodes(Running, + rabbit_channel, list_local, [], ?RPC_TIMEOUT). -spec list_local() -> [pid()]. diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index e6c251371a..070dc7bfee 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -19,6 +19,7 @@ -export([extract_extra_auth_props/4]). -include("rabbit.hrl"). +-include("rabbit_misc.hrl"). %%---------------------------------------------------------------------------- @@ -43,8 +44,9 @@ list_local() -> -spec list() -> [pid()]. list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running), - rabbit_direct, list_local, []). + Running = rabbit_mnesia:cluster_nodes(running), + rabbit_misc:append_rpc_all_nodes(Running, + rabbit_direct, list_local, [], ?RPC_TIMEOUT). %%---------------------------------------------------------------------------- diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 63760cd2e3..9c5096746d 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -47,6 +47,7 @@ ]). -include("rabbit.hrl"). +-include("rabbit_misc.hrl"). %% IANA-suggested ephemeral port range is 49152 to 65535 -define(FIRST_TEST_BIND_PORT, 49152). @@ -389,8 +390,9 @@ unregister_connection(Pid) -> pg_local:leave(rabbit_connections, Pid). -spec connections() -> [rabbit_types:connection()]. connections() -> - rabbit_misc:append_rpc_all_nodes(rabbit_mnesia:cluster_nodes(running), - rabbit_networking, connections_local, []). + Running = rabbit_mnesia:cluster_nodes(running), + rabbit_misc:append_rpc_all_nodes(Running, + rabbit_networking, connections_local, [], ?RPC_TIMEOUT). -spec local_connections() -> [rabbit_types:connection()]. %% @doc Returns pids of AMQP 0-9-1 and AMQP 1.0 connections local to this node. |