diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-05 10:39:46 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-05 10:39:46 +0100 |
| commit | 170fa80089f4c31072e2313596ed721bde0f276b (patch) | |
| tree | 5a1620dfe9c86acf96a98d7850970f9158204e99 /src | |
| parent | acf212e77a8d0efa79f6d5bc0f9d7be08c0c0edc (diff) | |
| download | rabbitmq-server-git-170fa80089f4c31072e2313596ed721bde0f276b.tar.gz | |
No we don't. The point is that if a mirror is dropping out of the queue, does it need to explicitly leave the GM group? The answer is no: the master is linked to the coordinator is linked to the GM / the slave is linked to the GM.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index e35b0808f6..473d96716e 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -126,7 +126,6 @@ terminate({shutdown, dropped} = Reason, %% in without this node being restarted. Thus we must do the full %% blown delete_and_terminate now, but only locally: we do not %% broadcast delete_and_terminate. - ok = gm:leave(GM), %% TODO presumably we need this? State #state { backing_queue_state = BQ:delete_and_terminate(Reason, BQS), set_delivered = 0 }; terminate(Reason, diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 5ed5f063e5..f245f91310 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -297,7 +297,6 @@ terminate({shutdown, dropped} = R, #state { gm = GM, backing_queue = BQ, backing_queue_state = BQS }) -> %% See rabbit_mirror_queue_master:terminate/2 - ok = gm:leave(GM), %% TODO presumably we need this? BQ:delete_and_terminate(R, BQS); terminate(Reason, #state { q = Q, gm = GM, |