node_critical takes into account where it is called from

Author: Alex Valiushko

deps/rabbit/BUILD.bazel

@@ -906,6 +906,11 @@ rabbitmq_integration_suite(
     size = "medium",
 )
 
+rabbitmq_suite(
+    name = "unit_quorum_queue_SUITE",
+    size = "medium",
+)
+
 rabbitmq_integration_suite(
     name = "unit_app_management_SUITE",
     size = "medium",

deps/rabbit/app.bzl

@@ -1621,6 +1621,15 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         erlc_opts = "//:test_erlc_opts",
         deps = ["//deps/amqp_client:erlang_app"],
     )
+    erlang_bytecode(
+        name = "unit_quorum_queue_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/unit_quorum_queue_SUITE.erl"],
+        outs = ["test/unit_quorum_queue_SUITE.beam"],
+        app_name = "rabbit",
+        erlc_opts = "//:test_erlc_opts",
+        deps = ["//deps/amqp_client:erlang_app"],
+    )
     erlang_bytecode(
         name = "unit_app_management_SUITE_beam_files",
         testonly = True,

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -51,7 +51,7 @@
 -export([file_handle_release_reservation/0]).
 -export([list_with_minimum_quorum/0,
          filter_quorum_critical/1,
-         filter_quorum_critical/2,
+         filter_quorum_critical/3,
          all_replica_states/0]).
 -export([capabilities/0]).
 -export([repair_amqqueue_nodes/1,
@@ -411,19 +411,21 @@ filter_quorum_critical(Queues) ->
     ReplicaStates = maps:from_list(
                         rabbit_misc:append_rpc_all_nodes(rabbit_nodes:list_running(),
                             ?MODULE, all_replica_states, [])),
-    filter_quorum_critical(Queues, ReplicaStates).
+    filter_quorum_critical(Queues, ReplicaStates, node()).
 
--spec filter_quorum_critical([amqqueue:amqqueue()], #{node() => #{atom() => atom()}}) -> [amqqueue:amqqueue()].
+-spec filter_quorum_critical([amqqueue:amqqueue()], #{node() => #{atom() => atom()}}, node()) ->
+    [amqqueue:amqqueue()].
 
-filter_quorum_critical(Queues, ReplicaStates) ->
+filter_quorum_critical(Queues, ReplicaStates, Self) ->
     lists:filter(fun (Q) ->
                     MemberNodes = rabbit_amqqueue:get_quorum_nodes(Q),
-                    {Name, _Node} = amqqueue:get_pid(Q),
-                    AllUp = lists:filter(fun (N) ->
-                                            {Name, _} = amqqueue:get_pid(Q),
-                                            case maps:get(N, ReplicaStates, undefined) of
+                    {Name, _} = amqqueue:get_pid(Q),
+                    AllUp = lists:filter(fun (Node) ->
+                                            case maps:get(Node, ReplicaStates, undefined) of
                                                 #{Name := State} when State =:= follower orelse State =:= leader ->
                                                     true;
+                                                #{Name := State} when State =:= nonvoter andalso Node =:= Self ->
+                                                    true;
                                                 _ -> false
                                             end
                                          end, MemberNodes),
@@ -1148,7 +1150,7 @@ add_member(Q, Node, Timeout) when ?amqqueue_is_quorum(Q) ->
     Conf = make_ra_conf(Q, ServerId, TickTimeout, SnapshotInterval),
     case ra:start_server(?RA_SYSTEM, Conf#{voter => false}) of
         ok ->
-            case ra:add_member(Members, ServerId, Timeout) of
+            case ra:add_member(Members, #{id => ServerId, voter => false}, Timeout) of
                 {ok, _, Leader} ->
                     Fun = fun(Q1) ->
                                   Q2 = update_type_state(

deps/rabbit/test/unit_quorum_queue_SUITE.erl

@@ -0,0 +1,26 @@
+-module(unit_quorum_queue_SUITE).
+
+-compile(export_all).
+
+all() ->
+  [
+    filter_quorum_critical_accounts_nonvoters
+  ].
+
+filter_quorum_critical_accounts_nonvoters(_Config) ->
+    Nodes = [test@leader, test@follower1, test@follower2],
+    Qs0 = [amqqueue:new(rabbit_misc:r(<<"/">>, queue, <<"q1">>),
+                                  {q1, test@leader},
+                                  false, false, none, [], undefined, #{}),
+                     amqqueue:new(rabbit_misc:r(<<"/">>, queue, <<"q2">>),
+                                  {q2, test@leader},
+                                  false, false, none, [], undefined, #{})
+                    ],
+    Qs = [Q1, Q2] = lists:map(fun (Q) -> amqqueue:set_type_state(Q, #{nodes => Nodes}) end, Qs0),
+    Ss = #{test@leader    => #{q1 => leader,   q2 => leader},
+           test@follower1 => #{q1 => nonvoter, q2 => follower},
+           test@follower2 => #{q1 => follower, q2 => nonvoter}},
+    Qs = rabbit_quorum_queue:filter_quorum_critical(Qs, Ss, test@leader),
+    [Q2] = rabbit_quorum_queue:filter_quorum_critical(Qs, Ss, test@follower1),
+    [Q1] = rabbit_quorum_queue:filter_quorum_critical(Qs, Ss, test@follower2),
+    ok.