Skip to content

Commit a59f6bc

Browse files
committed
Fix no_ack meaning
no_ack = true is equivalent to autoack [#154472211]
1 parent 74346ac commit a59f6bc

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/rabbit_amqqueue.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,9 +1041,9 @@ basic_get(#amqqueue{name = QName, pid = {Name, _} = Id, type = quorum}, ChPid, N
10411041
{ra_event, _, machine, {msg, MsgId, Msg}} ->
10421042
case NoAck of
10431043
true ->
1044-
ok;
1044+
{ok, _, _} = ra:send_and_await_consensus(Id, {settle, MsgId, self()});
10451045
false ->
1046-
{ok, _, _} = ra:send_and_await_consensus(Id, {settle, MsgId, self()})
1046+
ok
10471047
end,
10481048
{ok, quorum_messages(Name), {QName, Id, MsgId, false, Msg}}
10491049
end.

test/quorum_queue_SUITE.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ consume_from_queue(Config) ->
279279

280280
publish(Ch, QQ),
281281
wait_for_messages(Config, 0, QQ, <<"1">>, <<"1">>, <<"0">>),
282-
consume(Ch, QQ, true),
282+
consume(Ch, QQ, false),
283283
wait_for_messages(Config, 0, QQ, <<"1">>, <<"0">>, <<"1">>),
284284
rabbit_ct_client_helpers:close_channel(Ch),
285285
wait_for_messages(Config, 0, QQ, <<"1">>, <<"1">>, <<"0">>).
@@ -296,7 +296,7 @@ consume_and_autoack_from_queue(Config) ->
296296

297297
publish(Ch, QQ),
298298
wait_for_messages(Config, 0, QQ, <<"1">>, <<"1">>, <<"0">>),
299-
consume(Ch, QQ, false),
299+
consume(Ch, QQ, true),
300300
wait_for_messages(Config, 0, QQ, <<"0">>, <<"0">>, <<"0">>),
301301
rabbit_ct_client_helpers:close_channel(Ch),
302302
wait_for_messages(Config, 0, QQ, <<"0">>, <<"0">>, <<"0">>).
@@ -311,7 +311,7 @@ consume_from_empty_queue(Config) ->
311311
?assertEqual({'queue.declare_ok', QQ, 0, 0},
312312
declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
313313

314-
consume_empty(Ch, QQ, true).
314+
consume_empty(Ch, QQ, false).
315315

316316
%%----------------------------------------------------------------------------
317317

0 commit comments

Comments
 (0)