fix quorum queue status calculation to ignore non-voters

Author: Alex Valiushko

MODULE.bazel

@@ -338,8 +338,8 @@ erlang_package.hex_package(
     name = "ra_alt",
     build_file = "@rabbitmq-server//bazel:BUILD.ra",
     pkg = "ra",
-    sha256 = "20ba906dc4feb824f07facca227b5a4f9bf7435eb21f469028112313a64a8490",
-    version = "2.7.1",
+    sha256 = "950ece39e4ba109523d9176a507335a3144264bd7e2af461c36b206b2ef54e10",
+    version = "2.8.0",
 )
 
 erlang_package.git_package(

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -1672,34 +1672,36 @@ online(Q) when ?is_amqqueue(Q) ->
                   is_pid(Pid)].
 
 format(Q, Ctx) when ?is_amqqueue(Q) ->
-    %% TODO: this should really just be voters
-    Nodes = lists:sort(get_nodes(Q)),
+    Voters = get_voters(Q),
     Running = case Ctx of
                   #{running_nodes := Running0} ->
                       Running0;
                   _ ->
                       %% WARN: slow
                       rabbit_nodes:list_running()
               end,
-    Online = [N || N <- Nodes, lists:member(N, Running)],
+    OnlineVoters = [N || N <- Voters, lists:member(N, Running)],
     {_, LeaderNode} = amqqueue:get_pid(Q),
-    State = case is_minority(Nodes, Online) of
-                true when length(Online) == 0 ->
+    State = case is_minority(Voters, OnlineVoters) of
+                true when length(OnlineVoters) == 0 ->
                     down;
                 true ->
                     minority;
                 false ->
-                    case lists:member(LeaderNode, Online) of
+                    case lists:member(LeaderNode, OnlineVoters) of
                         true ->
                             running;
                         false ->
                             down
                     end
             end,
+    Nodes = lists:sort(get_nodes(Q)),
+    Online = [N || N <- Nodes, lists:member(N, Running)],
     [{type, quorum},
      {state, State},
      {node, LeaderNode},
      {members, Nodes},
+     {voters, Voters},
      {leader, LeaderNode},
      {online, Online}].
 
@@ -1783,6 +1785,14 @@ get_nodes(Q) when ?is_amqqueue(Q) ->
     #{nodes := Nodes} = amqqueue:get_type_state(Q),
     Nodes.
 
+get_voters(Q) when ?amqqueue_is_quorum(Q) ->
+    Leader = amqqueue:get_pid(Q),
+    case  ra:voters(Leader) of
+       {ok, Vs, _} -> [Node || {_RaName, Node} <- Vs];
+       _ -> []
+    end.
+
+
 get_connected_nodes(Q) when ?is_amqqueue(Q) ->
     ErlangNodes = [node() | nodes()],
     [N || N <- get_nodes(Q), lists:member(N, ErlangNodes)].
@@ -1907,6 +1917,9 @@ force_all_queues_shrink_member_to_current_member() ->
     rabbit_log:warning("Disaster recovery procedure: shrinking finished"),
     ok.
 
+is_minority([], _) ->
+    %% Leader couldn't list voters.
+    true;
 is_minority(All, Up) ->
     MinQuorum = length(All) div 2 + 1,
     length(Up) < MinQuorum.

deps/rabbitmq_cli/mix.exs

@@ -11,7 +11,7 @@ defmodule RabbitMQCtl.MixfileBase do
     [
       app: :rabbitmqctl,
       version: "3.13.0-dev",
-      elixir: ">= 1.13.4 and < 1.16.0",
+      elixir: ">= 1.13.4 and < 1.17.0",
       build_embedded: Mix.env() == :prod,
       start_permanent: Mix.env() == :prod,
       escript: [