diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-05-27 00:35:49 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-05-27 00:35:49 +0300 |
| commit | a4c74c5ca8905a5b3a32fc4b58567671d6b3577d (patch) | |
| tree | 2bb7bcd5405da417919ee157dd9bc3eb3361cb7c | |
| parent | beeb772e225ff5c325c726750ce32065eae5c680 (diff) | |
| parent | 1adb58bf81b030352b38c411c9a5b495e0067bb4 (diff) | |
| download | rabbitmq-server-git-a4c74c5ca8905a5b3a32fc4b58567671d6b3577d.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 8246fcea7e..9674a4ef2c 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -518,6 +518,7 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) -> Depth = BQ:depth(BQS1), true = Len == Depth, %% ASSERTION: everything must have been requeued ok = gm:broadcast(GM, {depth, Depth}), + WaitTimeout = rabbit_misc:get_env(rabbit, slave_wait_timeout, 15000), #state { name = QName, gm = GM, coordinator = CPid, @@ -525,7 +526,8 @@ promote_backing_queue_state(QName, CPid, BQ, BQS, GM, AckTags, Seen, KS) -> backing_queue_state = BQS1, seen_status = Seen, confirmed = [], - known_senders = sets:from_list(KS) }. + known_senders = sets:from_list(KS), + wait_timeout = WaitTimeout }. sender_death_fun() -> Self = self(), |