summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiana Corbacho <diana.corbacho@erlang-solutions.com>2016-01-26 13:10:58 +0000
committerDiana Corbacho <diana.corbacho@erlang-solutions.com>2016-01-27 12:15:40 +0000
commita540dcb15241df519d9ddf09896a0ee9d6fef9e2 (patch)
tree732dbdfe9dc462c5262d2a1c1d59003b730b2519 /src
parent6d3636afe1e45b23447e809094c7a7d75240ed0f (diff)
downloadrabbitmq-server-git-a540dcb15241df519d9ddf09896a0ee9d6fef9e2.tar.gz
Unblock receive after 15s
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mirror_queue_master.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 4556f72e78..057a4fad31 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -212,7 +212,15 @@ stop_all_slaves(Reason, #state{name = QName, gm = GM}) ->
%% monitor them but they would not have received the GM
%% message. So only wait for slaves which are still
%% not-partitioned.
- [receive {'DOWN', MRef, process, _Pid, _Info} -> ok end
+ [receive
+ {'DOWN', MRef, process, _Pid, _Info} ->
+ ok
+ after 15000 ->
+ rabbit_mirror_queue_misc:log_warning(
+ QName, "Missing 'DOWN' message from ~p in node ~p~n",
+ [Pid, node(Pid)]),
+ ok
+ end
|| {Pid, MRef} <- PidsMRefs, rabbit_mnesia:on_running_node(Pid)],
%% Normally when we remove a slave another slave or master will
%% notice and update Mnesia. But we just removed them all, and