|
 |
e44a2a |
From: Diana Corbacho <diana.corbacho@erlang-solutions.com>
|
|
|
e44a2a |
Date: Thu, 26 May 2016 16:05:16 +0100
|
|
|
e44a2a |
Subject: [PATCH] Initialise wait_timeout in slave promotion
|
|
|
e44a2a |
|
|
|
e44a2a |
|
|
|
e44a2a |
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
|
|
|
e44a2a |
index e447e9d..c481706 100644
|
|
|
e44a2a |
--- a/src/rabbit_mirror_queue_master.erl
|
|
|
e44a2a |
+++ b/src/rabbit_mirror_queue_master.erl
|
|
|
e44a2a |
@@ -518,6 +518,7 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) ->
|
|
|
e44a2a |
Depth = BQ:depth(BQS1),
|
|
|
e44a2a |
true = Len == Depth, %% ASSERTION: everything must have been requeued
|
|
|
e44a2a |
ok = gm:broadcast(GM, {depth, Depth}),
|
|
|
e44a2a |
+ WaitTimeout = rabbit_misc:get_env(rabbit, slave_wait_timeout, 15000),
|
|
|
e44a2a |
#state { name = QName,
|
|
|
e44a2a |
gm = GM,
|
|
|
e44a2a |
coordinator = CPid,
|
|
|
e44a2a |
@@ -525,7 +526,8 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) ->
|
|
|
e44a2a |
backing_queue_state = BQS1,
|
|
|
e44a2a |
seen_status = Seen,
|
|
|
e44a2a |
confirmed = [],
|
|
|
e44a2a |
- known_senders = sets:from_list(KS) }.
|
|
|
e44a2a |
+ known_senders = sets:from_list(KS),
|
|
|
e44a2a |
+ wait_timeout = WaitTimeout }.
|
|
|
e44a2a |
|
|
|
e44a2a |
sender_death_fun() ->
|
|
|
e44a2a |
Self = self(),
|