diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-20 14:43:49 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-20 14:43:49 +0000 |
| commit | 6ec37ddd63b1222debfd473e9abb84417806bd35 (patch) | |
| tree | b98d51ca495ce950ebce1792b087c2114f03b8c0 /src | |
| parent | b3fb3813834ca74e1d770615fbafe225e222c3b2 (diff) | |
| download | rabbitmq-server-git-6ec37ddd63b1222debfd473e9abb84417806bd35.tar.gz | |
amqqueue_process shouldn't confirm when a message is basic.got (it's the BQ's problem)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 29d52fec3c..7ba26e5f8f 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -878,7 +878,7 @@ handle_call({basic_get, ChPid, NoAck}, _From, sets:add_element(AckTag, ChAckTags)}), State2; - false -> confirm_message(Message, State2) + false -> State2 end, Msg = {QName, self(), AckTag, IsDelivered, Message}, reply({ok, Remaining, Msg}, State3) diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 565c61e7d0..85216dfc97 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1404,6 +1404,8 @@ msgs_confirmed(GuidSet, State) -> {gb_sets:to_list(GuidSet), remove_confirms(GuidSet, State)}. msgs_written_to_disk(QPid, GuidSet) -> + io:format("variable queue notified of msgs written to disk: ~p~n", + [gb_sets:size(GuidSet)]), rabbit_amqqueue:maybe_run_queue_via_backing_queue_async( QPid, fun (State = #vqstate { msgs_on_disk = MOD, msg_indices_on_disk = MIOD, @@ -1416,6 +1418,8 @@ msgs_written_to_disk(QPid, GuidSet) -> end). msg_indices_written_to_disk(QPid, GuidSet) -> + io:format("variable queue notified of msg idx written to disk: ~p~n", + [gb_sets:size(GuidSet)]), rabbit_amqqueue:maybe_run_queue_via_backing_queue_async( QPid, fun (State = #vqstate { msgs_on_disk = MOD, msg_indices_on_disk = MIOD, |