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 | 1391f8cd83970262545b4659654f8baf53d2c7c4 (patch) | |
| tree | e191549fbfd181c6aa59d58d17c9f351231e4747 | |
| parent | 53afb468e8ac87998360228a2ee4726b25c6b1c6 (diff) | |
| download | rabbitmq-server-git-1391f8cd83970262545b4659654f8baf53d2c7c4.tar.gz | |
Current thinking is fold should be master only. Interestingly, this also eliminates bug24854
| -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 bfdab487f3..daeb7d850f 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 98a80a2619..eb1da1e8a7 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, |