Skip to content

Quorum queues Raft machine: preserve order for missing deliveries (get_checked_out) #14386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Quorum queues Raft machine: preserve order for missing deliveries (get_checked_out) #14386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_fifo.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ handle_aux(_, _, {get_checked_out, ConsumerKey, MsgIds}, Aux0, RaAux0) ->
{S, Acc}
end
end, {RaAux0, []}, maps:with(MsgIds, Checked)),
{reply, {ok, IdMsgs}, Aux0, RaState};
{reply, {ok, lists:reverse(IdMsgs)}, Aux0, RaState};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it needs to be lists:sort/1 instead of lists:reverse, we can't make any assumptions about the maps ordering

_ ->
{reply, {error, consumer_not_found}, Aux0, RaAux0}
end;
Expand Down
46 changes: 45 additions & 1 deletion deps/rabbit/test/rabbit_fifo_int_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ all_tests() ->
flow,
test_queries,
duplicate_delivery,
usage
usage,

missing_messages_order
].

groups() ->
Expand Down Expand Up @@ -296,6 +298,48 @@ usage(Config) ->
?assert(Use > 0.0),
ok.

missing_messages_order(Config) ->
ClusterName = ?config(cluster_name, Config),
ServerId = ?config(node_id, Config),
UId = ?config(uid, Config),
Tag = UId,
ok = start_cluster(ClusterName, [ServerId]),
F1 = rabbit_fifo_client:init([ServerId]),
{empty, F3} = rabbit_fifo_client:dequeue(ClusterName, Tag, settled, F1),

{ok, F4, []} = rabbit_fifo_client:enqueue(ClusterName, msg1, F3),
{_, _, F5} = process_ra_events(receive_ra_events(1, 0), ClusterName, F4),

{ok, F6, []} = rabbit_fifo_client:enqueue(ClusterName, msg2, F5),
{_, _, F7} = process_ra_events(receive_ra_events(1, 0), ClusterName, F6),

{ok, F8, []} = rabbit_fifo_client:enqueue(ClusterName, msg3, F7),
{_, _, F9} = process_ra_events(receive_ra_events(1, 0), ClusterName, F8),

FC = rabbit_fifo_client:init([ServerId]),
{ok, _, FC3} = rabbit_fifo_client:checkout(Tag, {simple_prefetch, 10}, #{}, FC),

{ok, F10, []} = rabbit_fifo_client:enqueue(ClusterName, msg4, F9),
{_, E, F11}= process_ra_events(receive_ra_events(1, 0), ClusterName, F10),

receive
{ra_event, Qname, Evt1} = Msg ->
{ok, FC3b, Actions1} =
rabbit_fifo_client:handle_ra_event(Qname, Qname, Evt1, FC3),
[{deliver, _, true,
[{_,
missing_messages_order,0,false,msg1},
{_,
missing_messages_order,1,false,msg2},
{_,
missing_messages_order,2,false,msg3},
{_,
missing_messages_order,3,false,msg4}]}] = Actions1
after ?TIMEOUT ->
flush(),
exit(await_delivery_timeout)
end.

resends_lost_command(Config) ->
ClusterName = ?config(cluster_name, Config),
ServerId = ?config(node_id, Config),
Expand Down
Loading