Merge pull request #15062 from rabbitmq/qq-external

Avoid unncessary external function calls in QQs

Author: ansd

deps/rabbit/src/rabbit_fifo_client.erl

@@ -746,7 +746,7 @@ handle_ra_event(QName, Leader, close_cached_segments,
 handle_ra_event(_QName, _Leader, {machine, eol}, State) ->
     {eol, [{unblock, cluster_name(State)}]}.
 
--spec close(rabbit_fifo_client:state()) -> ok.
+-spec close(state()) -> ok.
 close(#state{cached_segments = undefined}) ->
     ok;
 close(#state{cached_segments = {_, _, Flru}}) ->

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -403,7 +403,7 @@ single_active_consumer_on(Q) ->
 
 update_consumer_handler(QName, {ConsumerTag, ChPid}, Exclusive, AckRequired,
                         Prefetch, Active, ActivityStatus, Args) ->
-    catch local_or_remote_handler(ChPid, rabbit_quorum_queue, update_consumer,
+    catch local_or_remote_handler(ChPid, ?MODULE, update_consumer,
                                   [QName, ChPid, ConsumerTag, Exclusive,
                                    AckRequired, Prefetch, Active,
                                    ActivityStatus, Args]).
@@ -416,7 +416,7 @@ update_consumer(QName, ChPid, ConsumerTag, Exclusive, AckRequired, Prefetch,
                                                ActivityStatus, Args).
 
 cancel_consumer_handler(QName, {ConsumerTag, ChPid}) ->
-    catch local_or_remote_handler(ChPid, rabbit_quorum_queue, cancel_consumer,
+    catch local_or_remote_handler(ChPid, ?MODULE, cancel_consumer,
                                   [QName, ChPid, ConsumerTag]).
 
 cancel_consumer(QName, ChPid, ConsumerTag) ->
@@ -1695,7 +1695,7 @@ dead_letter_publish(X, RK, QName, Reason, Msgs) ->
 
 find_quorum_queues(VHost) ->
     Node = node(),
-    rabbit_db_queue:get_all_by_type_and_node(VHost, rabbit_quorum_queue, Node).
+    rabbit_db_queue:get_all_by_type_and_node(VHost, ?MODULE, Node).
 
 i_totals(Q) when ?is_amqqueue(Q) ->
     QName = amqqueue:get_name(Q),
@@ -2326,7 +2326,7 @@ transfer_leadership(_CandidateNodes) ->
               %% by simply shutting its local QQ replica (Ra server)
               RaLeader = amqqueue:get_pid(Q),
               ?LOG_DEBUG("Will stop Ra leader ~tp", [RaLeader]),
-              case rabbit_quorum_queue:stop_server(RaLeader) of
+              case stop_server(RaLeader) of
                   ok ->
                       ?LOG_DEBUG("Successfully stopped Ra server ~tp", [RaLeader]);
                   {error, nodedown} ->
@@ -2373,7 +2373,7 @@ stop_local_quorum_queue_followers() ->
         {RegisteredName, _LeaderNode} = amqqueue:get_pid(Q),
         RaNode = {RegisteredName, node()},
         ?LOG_DEBUG("Will stop Ra server ~tp", [RaNode]),
-        case rabbit_quorum_queue:stop_server(RaNode) of
+        case stop_server(RaNode) of
             ok     ->
                 ?LOG_DEBUG("Successfully stopped Ra server ~tp", [RaNode]);
             {error, nodedown} ->
@@ -2389,7 +2389,7 @@ revive_local_queue_members() ->
     Queues = rabbit_amqqueue:list_local_followers(),
     %% NB: this function ignores the first argument so we can just pass the
     %% empty binary as the vhost name.
-    {Recovered, Failed} = rabbit_quorum_queue:recover(<<>>, Queues),
+    {Recovered, Failed} = recover(<<>>, Queues),
     ?LOG_DEBUG("Successfully revived ~b quorum queue replicas",
                      [length(Recovered)]),
     case length(Failed) of