Skip to content

Commit 25f8336

Browse files
committed
QQ: handle tick tweaks
to do leader repair earlier in tick function
1 parent f10e084 commit 25f8336

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ handle_tick(QName,
583583
fun() ->
584584
try
585585
{ok, Q} = rabbit_amqqueue:lookup(QName),
586+
ok = repair_leader_record(Q, Name),
586587
Reductions = reductions(Name),
587588
rabbit_core_metrics:queue_stats(QName, NumReadyMsgs,
588589
NumCheckedOut, NumMessages,
@@ -636,7 +637,6 @@ handle_tick(QName,
636637
end}
637638
| Infos0],
638639
rabbit_core_metrics:queue_stats(QName, Infos),
639-
ok = repair_leader_record(Q, Name),
640640
case repair_amqqueue_nodes(Q) of
641641
ok ->
642642
ok;
@@ -1763,7 +1763,7 @@ i(leader, Q) -> leader(Q);
17631763
i(open_files, Q) when ?is_amqqueue(Q) ->
17641764
{Name, _} = amqqueue:get_pid(Q),
17651765
Nodes = get_connected_nodes(Q),
1766-
{Data, _} = rpc:multicall(Nodes, ?MODULE, open_files, [Name]),
1766+
{Data, _} = rpc:multicall(Nodes, ?MODULE, open_files, [Name], ?RPC_TIMEOUT),
17671767
lists:flatten(Data);
17681768
i(single_active_consumer_pid, Q) when ?is_amqqueue(Q) ->
17691769
QPid = amqqueue:get_pid(Q),

0 commit comments

Comments
 (0)