Merge pull request #11820 from rabbitmq/mergify/bp/v4.0.x/pr-11809

QQ: use a dedicated function for queue recovery after Ra system restart. (backport #11809)

Author: michaelklishin

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -17,6 +17,7 @@
          handle_event/3]).
 -export([is_recoverable/1,
          recover/2,
+         system_recover/1,
          stop/1,
          start_server/1,
          restart_server/1,
@@ -97,6 +98,11 @@
 -define(RA_SYSTEM, quorum_queues).
 -define(RA_WAL_NAME, ra_log_wal).
 
+-define(INFO(Str, Args),
+        rabbit_log:info("[~s:~s/~b] " Str,
+                        [?MODULE, ?FUNCTION_NAME, ?FUNCTION_ARITY | Args])).
+
+
 -define(STATISTICS_KEYS,
         [policy,
          operator_policy,
@@ -641,6 +647,21 @@ is_recoverable(Q) when ?is_amqqueue(Q) and ?amqqueue_is_quorum(Q) ->
     Nodes = get_nodes(Q),
     lists:member(Node, Nodes).
 
+system_recover(quorum_queues) ->
+    case rabbit:is_booted() of
+        true ->
+            Queues = rabbit_amqqueue:list_local_quorum_queues(),
+            ?INFO("recovering ~b queues", [length(Queues)]),
+            {Recovered, Failed} = recover(<<>>, Queues),
+            ?INFO("recovered ~b queues, "
+                  "failed to recover ~b queues",
+                  [length(Recovered), length(Failed)]),
+            ok;
+        false ->
+            ?INFO("rabbit not booted, skipping queue recovery", []),
+            ok
+    end.
+
 -spec recover(binary(), [amqqueue:amqqueue()]) ->
     {[amqqueue:amqqueue()], [amqqueue:amqqueue()]}.
 recover(_Vhost, Queues) ->

deps/rabbit/src/rabbit_ra_systems.erl

@@ -130,7 +130,8 @@ get_config(quorum_queues = RaSystem) ->
                    wal_max_entries => WalMaxEntries,
                    segment_compute_checksums => SegmentChecksums,
                    compress_mem_tables => CompressMemTables,
-                   server_recovery_strategy => registered};
+                   server_recovery_strategy => {rabbit_quorum_queue,
+                                                system_recover, []}};
 get_config(coordination = RaSystem) ->
     DefaultConfig = get_default_config(),
     CoordDataDir = filename:join(