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 | 7d58dbfd96c6a5b87e7a5a3520106dacbf365254 (patch) | |
| tree | 5a1620dfe9c86acf96a98d7850970f9158204e99 | |
| parent | 6578389b1df1937fb08bb7a1621b50f09cb7416e (diff) | |
| download | rabbitmq-server-7d58dbfd96c6a5b87e7a5a3520106dacbf365254.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.
| -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 e35b0808..473d9671 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 5ed5f063..f245f913 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, |