Skip to content

Fix dlx checkout command redirection #16203

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

Merged
mkuratczyk merged 1 commit into from
Apr 23, 2026
Merged

Fix dlx checkout command redirection #16203

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
45 changes: 30 additions & 15 deletions deps/rabbit/src/rabbit_fifo_dlx_client.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,38 @@ checkout(QResource, Leader, NumUnsettled) ->
State = #state{queue_resource = QResource,
leader = Leader,
last_msg_id = -1},
process_command(Cmd, State, 5).
checkout0(Cmd, State, 5).

process_command(_Cmd, _State, 0) ->
checkout0(_Cmd, _State, 0) ->
{error, ra_command_failed};
process_command(Cmd, #state{leader = Leader} = State, Tries) ->
case ra:process_command(Leader, Cmd, 60_000) of
{ok, ok, Leader} ->
{ok, State#state{leader = Leader}};
{ok, ok, NonLocalLeader} ->
?LOG_WARNING("Failed to process command ~tp on queue leader ~tp because actual leader is ~tp.",
[Cmd, Leader, NonLocalLeader]),
{error, non_local_leader};
Err ->
?LOG_WARNING("Failed to process command ~tp on queue leader ~tp: ~tp~n"
"Trying ~b more time(s)...",
[Cmd, Leader, Err, Tries]),
process_command(Cmd, State, Tries - 1)
checkout0(Cmd, #state{leader = Leader} = State, Tries) ->
Correlation = make_ref(),
%% We use ra:pipeline_command/4 instead of ra:process_command/3 because the
%% latter internally redirects to the new leader which we don't want.
ra:pipeline_command(Leader, Cmd, Correlation, normal),
receive_applied(Cmd, Correlation, State, Tries).

receive_applied(Cmd, Corr, #state{queue_resource = QName,
leader = Leader} = State, Tries) ->
receive
{'$gen_cast', {queue_event, QName, {Leader, {applied, Results}}}} ->
case lists:member({Corr, ok}, Results) of
true ->
{ok, State};
false ->
receive_applied(Cmd, Corr, State, Tries)
end;
{'$gen_cast', {queue_event, QName,
{_From, {rejected, {not_leader, NonLocalLeader, Corr}}}}} ->
?LOG_WARNING("failed to apply command ~tp on leader ~tp "
"because actual leader is ~tp",
[Cmd, Leader, NonLocalLeader]),
{error, non_local_leader}
after 60_000 ->
?LOG_WARNING("timed out applying command ~tp on leader ~tp; "
"trying ~b more time(s)...",
[Cmd, Leader, Tries - 1]),
checkout0(Cmd, State, Tries - 1)
end.

-spec handle_ra_event(pid(), term(), state()) ->
Expand Down
58 changes: 31 additions & 27 deletions deps/rabbit/test/rabbit_fifo_dlx_integration_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,35 +38,37 @@

all() ->
[
{group, single_node},
{group, cluster_size_1},
{group, cluster_size_3}
].

groups() ->
[
{single_node, [shuffle], [
expired,
rejected,
delivery_limit,
target_queue_not_bound,
target_queue_deleted,
dlx_missing,
cycle,
stats,
drop_head_falls_back_to_at_most_once,
switch_strategy,
reject_publish_source_queue_max_length,
reject_publish_source_queue_max_length_bytes,
reject_publish_target_classic_queue,
reject_publish_max_length_target_quorum_queue,
target_quorum_queue_delete_create
]},
{cluster_size_3, [], [
reject_publish_max_length_target_quorum_queue,
reject_publish_down_target_quorum_queue,
many_target_queues,
single_dlx_worker
]}
{cluster_size_1, [shuffle],
[
expired,
rejected,
delivery_limit,
target_queue_not_bound,
target_queue_deleted,
dlx_missing,
cycle,
stats,
drop_head_falls_back_to_at_most_once,
switch_strategy,
reject_publish_source_queue_max_length,
reject_publish_source_queue_max_length_bytes,
reject_publish_target_classic_queue,
reject_publish_max_length_target_quorum_queue,
target_quorum_queue_delete_create
]},
{cluster_size_3, [],
[
reject_publish_max_length_target_quorum_queue,
reject_publish_down_target_quorum_queue,
many_target_queues,
single_dlx_worker
]}
].

init_per_suite(Config0) ->
Expand All @@ -86,7 +88,7 @@ init_per_suite(Config0) ->
end_per_suite(Config) ->
rabbit_ct_helpers:run_teardown_steps(Config).

init_per_group(single_node = Group, Config) ->
init_per_group(cluster_size_1 = Group, Config) ->
init_per_group(Group, Config, 1);
init_per_group(cluster_size_3 = Group, Config) ->
init_per_group(Group, Config, 3).
Expand Down Expand Up @@ -954,15 +956,17 @@ single_dlx_worker(Config) ->
ok = rabbit_ct_broker_helpers:kill_node(Config, Leader0),
{ok, _, {_, Leader1}} = ?awaitMatch({ok, _, _},
ra:members({RaName, Follower0}),
30000),
30_000),
?assertNotEqual(Leader0, Leader1),
[Follower1] = [Server1, Follower0] -- [Leader1],
assert_active_dlx_workers(0, Config, Follower1),
assert_active_dlx_workers(1, Config, Leader1),
ok = rabbit_ct_broker_helpers:start_node(Config, Leader0).

assert_active_dlx_workers(N, Config, Server) ->
?awaitMatch(N, length(rpc(Config, Server, supervisor, which_children, [rabbit_fifo_dlx_sup], 2000)), 60000).
?awaitMatch(N,
length(rpc(Config, Server, supervisor, which_children, [rabbit_fifo_dlx_sup], 5000)),
60_000).

declare_queue(Channel, Queue, Args) ->
#'queue.declare_ok'{} = amqp_channel:call(Channel, #'queue.declare'{
Expand Down
Loading