diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-11-01 16:24:58 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-11-01 16:24:58 +0000 |
| commit | 43a62415ae10a86c4eeb913b42e9ff8e2113a448 (patch) | |
| tree | 77fc6d780f3be53bf43fcff35d9ccc329ec6f64a | |
| parent | 7f046795cb87816408ae9136d837abd4e5e24a45 (diff) | |
| parent | b277407129aa65361382865a641c51d1f5032e52 (diff) | |
| download | rabbitmq-server-43a62415ae10a86c4eeb913b42e9ff8e2113a448.tar.gz | |
Merged bug25849 into stablerabbitmq_v3_2_1
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index ac309896..6f78d1d2 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -672,8 +672,13 @@ confirm_sender_death(Pid) -> ok. forget_sender(_, running) -> false; +forget_sender(down_from_gm, down_from_gm) -> false; %% [1] forget_sender(Down1, Down2) when Down1 =/= Down2 -> true. +%% [1] If another slave goes through confirm_sender_death/1 before we +%% do we can get two GM sender_death messages in a row for the same +%% channel - don't treat that as anything special. + %% Record and process lifetime events from channels. Forget all about a channel %% only when down notifications are received from both the channel and from gm. maybe_forget_sender(ChPid, ChState, State = #state { sender_queues = SQ, |