Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions deps/rabbit/src/rabbit_quorum_queue.erl
Original file line number Diff line number Diff line change
Expand Up @@ -424,11 +424,13 @@ local_or_remote_handler(ChPid, Module, Function, Args) ->
erpc:cast(Node, Module, Function, Args)
end.

become_leader(QName, Name) ->
become_leader(_QName, _Name) ->
%% noop now as we instead rely on the promt tick_timeout + repair
ok.
%% 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).
% spawn(fun () -> become_leader0(QName, Name) end).

become_leader0(QName, Name) ->
Fun = fun (Q1) ->
Expand Down Expand Up @@ -682,8 +684,8 @@ repair_leader_record(Q, Self) ->
ok;
_ ->
QName = amqqueue:get_name(Q),
rabbit_log:debug("~ts: repairing leader record",
[rabbit_misc:rs(QName)]),
rabbit_log:debug("~ts: updating leader record to current node ~b",
[rabbit_misc:rs(QName), Node]),
{_, Name} = erlang:process_info(Self, registered_name),
ok = become_leader0(QName, Name),
ok
Expand Down
3 changes: 2 additions & 1 deletion rabbitmq-components.mk
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ 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 = git https://github.com/rabbitmq/ra tick-timout-tweak
ep_ra = hex 2.16.3
dep_ranch = hex 2.2.0
dep_recon = hex 2.5.6
dep_redbug = hex 2.0.7
Expand Down
Loading