From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 2 Feb 2016 17:19:19 +0300
Subject: [PATCH] Make slaves wait timeout configurable instead of hardcoded
 15000

This slightly improves rabbitmq/rabbitmq-server#584

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index b7c2d9d..f0ddbe8 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -41,7 +41,8 @@
                  backing_queue_state,
                  seen_status,
                  confirmed,
-                 known_senders
+                 known_senders,
+                 wait_timeout
                }).
 
 -ifdef(use_specs).
@@ -128,7 +129,15 @@ init_with_existing_bq(Q = #amqqueue{name = QName}, BQ, BQS) ->
              backing_queue_state = BQS,
              seen_status         = dict:new(),
              confirmed           = [],
-             known_senders       = sets:new() }.
+             known_senders       = sets:new(),
+             wait_timeout        = get_slave_wait_timeout() }.
+
+get_slave_wait_timeout() ->
+    case application:get_env(rabbit, slave_wait_timeout) of
+	    {ok, T}   -> T;
+	    undefined -> 15000
+    end.
+
 
 stop_mirroring(State = #state { coordinator         = CPid,
                                 backing_queue       = BQ,
@@ -199,7 +208,7 @@ delete_and_terminate(Reason, State = #state { backing_queue       = BQ,
     stop_all_slaves(Reason, State),
     State#state{backing_queue_state = BQ:delete_and_terminate(Reason, BQS)}.
 
-stop_all_slaves(Reason, #state{name = QName, gm = GM}) ->
+stop_all_slaves(Reason, #state{name = QName, gm = GM, wait_timeout = WT}) ->
     {ok, #amqqueue{slave_pids = SPids}} = rabbit_amqqueue:lookup(QName),
     PidsMRefs = [{Pid, erlang:monitor(process, Pid)} || Pid <- [GM | SPids]],
     ok = gm:broadcast(GM, {delete_and_terminate, Reason}),
@@ -211,7 +220,7 @@ stop_all_slaves(Reason, #state{name = QName, gm = GM}) ->
     [receive
          {'DOWN', MRef, process, _Pid, _Info} ->
              ok
-     after 15000 ->
+     after WT ->
              rabbit_mirror_queue_misc:log_warning(
                QName, "Missing 'DOWN' message from ~p in node ~p~n",
                [Pid, node(Pid)]),