Skip to content

Ra 2.16.5 - bug fixes and minor improvements #13638

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
Mar 27, 2025
Merged

Ra 2.16.5 - bug fixes and minor improvements #13638

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
19 changes: 8 additions & 11 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 @@ -425,11 +425,10 @@ local_or_remote_handler(ChPid, Module, Function, Args) ->
erpc:cast(Node, Module, Function, Args)
end.

become_leader(QName, Name) ->
%% as this function is called synchronously when a ra node becomes leader
%% we need to ensure there is no chance of blocking as else the ra node
%% may not be able to establish its leadership
spawn(fun () -> become_leader0(QName, Name) end).
become_leader(_QName, _Name) ->
%% noop now as we instead rely on the promt tick_timeout + repair to update
%% the meta data store after a leader change
ok.

become_leader0(QName, Name) ->
Fun = fun (Q1) ->
Expand Down Expand Up @@ -580,7 +579,6 @@ handle_tick(QName,
Nodes) ->
%% this makes calls to remote processes so cannot be run inside the
%% ra server
Self = self(),
spawn(
fun() ->
try
Expand Down Expand Up @@ -638,7 +636,7 @@ handle_tick(QName,
end}
| Infos0],
rabbit_core_metrics:queue_stats(QName, Infos),
ok = repair_leader_record(Q, Self),
ok = repair_leader_record(Q, Name),
case repair_amqqueue_nodes(Q) of
ok ->
ok;
Expand Down Expand Up @@ -675,17 +673,16 @@ handle_tick(QName, Config, _Nodes) ->
rabbit_log:debug("~ts: handle tick received unexpected config format ~tp",
[rabbit_misc:rs(QName), Config]).

repair_leader_record(Q, Self) ->
repair_leader_record(Q, Name) ->
Node = node(),
case amqqueue:get_pid(Q) of
{_, Node} ->
%% it's ok - we don't need to do anything
ok;
_ ->
QName = amqqueue:get_name(Q),
rabbit_log:debug("~ts: repairing leader record",
[rabbit_misc:rs(QName)]),
{_, Name} = erlang:process_info(Self, registered_name),
rabbit_log:debug("~ts: updating leader record to current node ~b",
[rabbit_misc:rs(QName), Node]),
ok = become_leader0(QName, Name),
ok
end,
Expand Down
87 changes: 42 additions & 45 deletions deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,53 +482,50 @@ queues_enable_totals_test(Config) ->
Publish(<<"foo">>),

Fun = fun() ->
length(rabbit_ct_broker_helpers:rpc(Config, 0, ets, tab2list,
[queue_coarse_metrics])) == 2
Queues = http_get(Config, "/queues/%2F"),
Queue = http_get(Config, "/queues/%2F/foo"),

Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
NodeBin = atom_to_binary(Node, utf8),
assert_list([#{name => <<"baz">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => false,
arguments => #{'x-queue-type' => <<"classic">>},
node => NodeBin,
messages => 1,
messages_ready => 1,
messages_unacknowledged => 0},
#{name => <<"foo">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => null,
arguments => #{'x-queue-type' => <<"quorum">>},
leader => NodeBin,
messages => 2,
messages_ready => 2,
messages_unacknowledged => 0,
members => [NodeBin]}], Queues),
assert_item(#{name => <<"foo">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => null,
arguments => #{'x-queue-type' => <<"quorum">>},
leader => NodeBin,
messages => 2,
messages_ready => 2,
messages_unacknowledged => 0,
members => [NodeBin]}, Queue),

?assert(not maps:is_key(message_stats, Queue)),
?assert(not maps:is_key(messages_details, Queue)),
?assert(not maps:is_key(reductions_details, Queue)),
true
end,
await_condition(Fun),

Queues = http_get(Config, "/queues/%2F"),
Queue = http_get(Config, "/queues/%2F/foo"),

Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
NodeBin = atom_to_binary(Node, utf8),
assert_list([#{name => <<"baz">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => false,
arguments => #{'x-queue-type' => <<"classic">>},
node => NodeBin,
messages => 1,
messages_ready => 1,
messages_unacknowledged => 0},
#{name => <<"foo">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => null,
arguments => #{'x-queue-type' => <<"quorum">>},
leader => NodeBin,
messages => 2,
messages_ready => 2,
messages_unacknowledged => 0,
members => [NodeBin]}], Queues),
assert_item(#{name => <<"foo">>,
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => null,
arguments => #{'x-queue-type' => <<"quorum">>},
leader => NodeBin,
messages => 2,
messages_ready => 2,
messages_unacknowledged => 0,
members => [NodeBin]}, Queue),

?assert(not maps:is_key(message_stats, Queue)),
?assert(not maps:is_key(messages_details, Queue)),
?assert(not maps:is_key(reductions_details, Queue)),

http_delete(Config, "/queues/%2F/foo", {group, '2xx'}),
http_delete(Config, "/queues/%2F/baz", {group, '2xx'}),
close_connection(Conn),
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq-components.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dep_khepri_mnesia_migration = hex 0.7.1
dep_meck = hex 1.0.0
dep_osiris = git https://github.com/rabbitmq/osiris v1.8.6
dep_prometheus = hex 4.11.0
dep_ra = hex 2.16.3
dep_ra = hex 2.16.5
dep_ranch = hex 2.2.0
dep_recon = hex 2.5.6
dep_redbug = hex 2.0.7
Expand Down
Loading