QQ: handle tick tweaks

to do leader repair earlier in tick function

Author: kjnilsson

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -583,6 +583,7 @@ handle_tick(QName,
       fun() ->
               try
                   {ok, Q} = rabbit_amqqueue:lookup(QName),
+                  ok = repair_leader_record(Q, Name),
                   Reductions = reductions(Name),
                   rabbit_core_metrics:queue_stats(QName, NumReadyMsgs,
                                                   NumCheckedOut, NumMessages,
@@ -636,12 +637,12 @@ handle_tick(QName,
                                             end}
                            | Infos0],
                   rabbit_core_metrics:queue_stats(QName, Infos),
-                  ok = repair_leader_record(Q, Name),
                   case repair_amqqueue_nodes(Q) of
                       ok ->
                           ok;
                       repaired ->
-                          rabbit_log:debug("Repaired quorum queue ~ts amqqueue record", [rabbit_misc:rs(QName)])
+                          rabbit_log:debug("Repaired quorum queue ~ts amqqueue record",
+                                           [rabbit_misc:rs(QName)])
                   end,
                   ExpectedNodes = rabbit_nodes:list_members(),
                   case Nodes -- ExpectedNodes of
@@ -1763,7 +1764,7 @@ i(leader, Q) -> leader(Q);
 i(open_files, Q) when ?is_amqqueue(Q) ->
     {Name, _} = amqqueue:get_pid(Q),
     Nodes = get_connected_nodes(Q),
-    {Data, _} = rpc:multicall(Nodes, ?MODULE, open_files, [Name]),
+    {Data, _} = rpc:multicall(Nodes, ?MODULE, open_files, [Name], ?RPC_TIMEOUT),
     lists:flatten(Data);
 i(single_active_consumer_pid, Q) when ?is_amqqueue(Q) ->
     QPid = amqqueue:get_pid(Q),
@@ -1883,7 +1884,7 @@ online(Q) when ?is_amqqueue(Q) ->
     Nodes = get_connected_nodes(Q),
     {Name, _} = amqqueue:get_pid(Q),
     [node(Pid) || {ok, Pid} <-
-                  erpc:multicall(Nodes, erlang, whereis, [Name]),
+                  erpc:multicall(Nodes, erlang, whereis, [Name], ?RPC_TIMEOUT),
                   is_pid(Pid)].
 
 format(Q, Ctx) when ?is_amqqueue(Q) ->