Skip to content

Require feature flag quorum_queue_non_voters #14738

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
merged 1 commit into from
Oct 17, 2025
Merged

Require feature flag quorum_queue_non_voters #14738

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
5 changes: 2 additions & 3 deletions deps/rabbit/src/rabbit_core_ff.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,8 @@

-rabbit_feature_flag(
{quorum_queue_non_voters,
#{desc =>
"Allows new quorum queue members to be added as non voters initially.",
stability => stable,
#{desc => "Allows new quorum queue members to be added as non voters initially.",
stability => required,
depends_on => [quorum_queue]
}}).

Expand Down
8 changes: 1 addition & 7 deletions deps/rabbit/src/rabbit_quorum_queue.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,13 +1389,7 @@ do_add_member(Q, Node, Membership, Timeout)
Conf = make_ra_conf(Q, ServerId, Membership, MachineVersion),
case ra:start_server(?RA_SYSTEM, Conf) of
ok ->
ServerIdSpec =
case rabbit_feature_flags:is_enabled(quorum_queue_non_voters) of
true ->
maps:with([id, uid, membership], Conf);
false ->
maps:get(id, Conf)
end,
ServerIdSpec = maps:with([id, uid, membership], Conf),
case ra:add_member(Members, ServerIdSpec, Timeout) of
{ok, {RaIndex, RaTerm}, Leader} ->
Fun = fun(Q1) ->
Expand Down
4 changes: 1 addition & 3 deletions deps/rabbit/test/quorum_queue_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2810,10 +2810,8 @@ add_member(Config) ->

add_member_2(Config) ->
%% this tests a scenario where an older node version is running a QQ
%% and a member is added on a newer node version (for mixe testing)
%% and a member is added on a newer node version (for mixed testing)

%% we dont validate the ff was enabled as this test should pass either way
_ = rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue_non_voters),
[Server0, Server1 | _] = _Servers0 =
rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
Ch = rabbit_ct_client_helpers:open_channel(Config, Server1),
Expand Down
Loading