diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2012-04-05 13:53:30 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2012-04-05 13:53:30 +0100 |
| commit | edf4bcfe0ecddb6232a3830ba328053c0d4436e1 (patch) | |
| tree | e191549fbfd181c6aa59d58d17c9f351231e4747 | |
| parent | 2926a01ac57900cf4a45b438c80e1fd9817c9f3c (diff) | |
| download | rabbitmq-server-bug24855.tar.gz | |
Current thinking is fold should be master only. Interestingly, this also eliminates bug24854bug24855
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index bfdab487..daeb7d85 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -252,9 +252,7 @@ ack(AckTags, State = #state { gm = GM, fold(MsgFun, State = #state { gm = GM, backing_queue = BQ, backing_queue_state = BQS}, AckTags) -> - BQS1 = BQ:fold(MsgFun, BQS, AckTags), - ok = gm:broadcast(GM, {fold, MsgFun, AckTags}), - State #state { backing_queue_state = BQS1 }. + State #state { backing_queue_state = BQ:fold(MsgFun, BQS, AckTags) }. requeue(AckTags, State = #state { gm = GM, backing_queue = BQ, diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 98a80a26..eb1da1e8 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -843,11 +843,6 @@ process_instruction({ack, MsgIds}, [] = MsgIds1 -- MsgIds, %% ASSERTION {ok, State #state { msg_id_ack = MA1, backing_queue_state = BQS1 }}; -process_instruction({fold, MsgFun, AckTags}, - State = #state { backing_queue = BQ, - backing_queue_state = BQS }) -> - BQS1 = BQ:fold(AckTags, MsgFun, BQS), - {ok, State #state { backing_queue_state = BQS1 }}; process_instruction({requeue, MsgIds}, State = #state { backing_queue = BQ, backing_queue_state = BQS, |