diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-05-27 00:33:51 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2016-05-27 00:33:51 +0300 |
| commit | 1adb58bf81b030352b38c411c9a5b495e0067bb4 (patch) | |
| tree | d2643242dec505ddea1c4e351d7e0d16eba2a704 /src | |
| parent | dae432e0caf5474564d8a7bb8b093163bab9d469 (diff) | |
| parent | bf5879e4ec987ca5a446cc03c2262b10bad637ba (diff) | |
| download | rabbitmq-server-git-1adb58bf81b030352b38c411c9a5b495e0067bb4.tar.gz | |
Merge pull request #813 from rabbitmq/rabbitmq-server-812
Initialise wait_timeout in slave promotion
Diffstat (limited to 'src')
| -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(), |