summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-12-17 00:31:55 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2010-12-17 00:31:55 +0000
commit71809f4e35e7c5c98735d13e970e7c19296d0345 (patch)
tree2a7b1797f8f32860659ccd09fa7f00ea0e6b2aa9
parent91e9438fb63cab946e8dde6af72cdc2d81c9bb1b (diff)
downloadrabbitmq-server-git-71809f4e35e7c5c98735d13e970e7c19296d0345.tar.gz
Correct places to do confirmation stuff
-rw-r--r--src/rabbit_mirror_queue_slave.erl2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index ac49b10b29..7fb13c5c23 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -456,7 +456,6 @@ process_instruction({ack, Guids},
{AckTags, GA1} = guids_to_acktags(Guids, GA),
{Guids1, BQS1} = BQ:ack(AckTags, BQS),
[] = Guids1 -- Guids, %% ASSERTION
- %% CONFIRM - persistent but delivered faster than disk sync
{processed, State #state { guid_ack = GA1,
backing_queue_state = BQS1 }};
process_instruction({requeue, MsgPropsFun, Guids},
@@ -475,7 +474,6 @@ process_instruction({requeue, MsgPropsFun, Guids},
%% GA
{_Count, BQS1} = BQ:purge(BQS),
{Guids, BQS2} = ack_all(BQ, GA, BQS1),
- %% CONFIRM these Guids
State #state { guid_ack = dict:new(),
backing_queue_state = BQS2 }
end};