diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-10-20 17:01:50 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-10-20 17:01:50 +0100 |
| commit | 106c5a0c6f0161a13d3601cb38a08f58c68d94fa (patch) | |
| tree | b3ca7bb160b878065df7ae8b5a6c81698dfc7d23 /src/rabbit_mirror_queue_slave.erl | |
| parent | daa4f4fb8520c2bc5c49cb26cf6bc1b95901aebf (diff) | |
| parent | 844aa5ee0fe2ae43fb5cc6590a0936c99f97488f (diff) | |
| download | rabbitmq-server-106c5a0c6f0161a13d3601cb38a08f58c68d94fa.tar.gz | |
Crude merge-from-default to help examine this thing. Currently some tests fail due to q_p blowing up with failed assertions, I don't know if it was like that before.
Diffstat (limited to 'src/rabbit_mirror_queue_slave.erl')
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index f423760a..52511c96 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -818,12 +818,12 @@ process_instruction({fetch, AckRequired, MsgId, Remaining}, %% we must be shorter than the master State end}; -process_instruction({ack, MsgIds}, +process_instruction({ack, Fun, MsgIds}, State = #state { backing_queue = BQ, backing_queue_state = BQS, msg_id_ack = MA }) -> {AckTags, MA1} = msg_ids_to_acktags(MsgIds, MA), - {MsgIds1, BQS1} = BQ:ack(AckTags, BQS), + {MsgIds1, BQS1} = BQ:ack(AckTags, Fun, BQS), [] = MsgIds1 -- MsgIds, %% ASSERTION {ok, State #state { msg_id_ack = MA1, backing_queue_state = BQS1 }}; |