Filter out nodes being drained

Author: SimonUnge

deps/rabbit/src/rabbit_queue_member_eval.erl

@@ -113,25 +113,30 @@ eval_quorum_members(_ExpectedNodes, _Running, [], _TargetSize, Result) ->
 eval_quorum_members(ExpectedNodes, Running, [Q | LocalLeaders], TargetSize, OldResult) ->
     {ok, Members, {_, LeaderNode}} = ra:members(amqqueue:get_pid(Q)),
 
-    %% Check if Leader is indeed this node
-    Result = case LeaderNode =:= node() of
-                 true ->
-                     MemberNodes = [Node || {_, Node} <- Members],
-                     Remove = MemberNodes -- ExpectedNodes,
-                     case Remove of
-                         [] ->
-                             add_member(Q, Running, MemberNodes, get_target_size(Q, TargetSize));
-                         _ ->
-                             remove_members(Q, Remove)
-                     end;
-                 false ->
-                     noop
-             end,
+    Result =
+    maybe
+        %% Check if Leader is indeed this node
+        LeaderNode ?= node(),
+        %% And that this not is not in maintenance mode
+        true ?= not rabbit_maintenance:is_being_drained_local_read(node()),
+        MemberNodes = [Node || {_, Node} <- Members],
+        Remove = MemberNodes -- ExpectedNodes,
+        case Remove of
+            [] ->
+                add_member(Q, Running, MemberNodes, get_target_size(Q, TargetSize));
+            _ ->
+                remove_members(Q, Remove)
+        end
+    else
+        _ ->
+            noop
+    end,
     eval_quorum_members(ExpectedNodes, Running, LocalLeaders, TargetSize,
                         update_result(OldResult, Result)).
 
 add_member(Q, Running, MemberNodes, TargetSize) ->
-    New = Running -- MemberNodes,
+    %% Filter out any new nodes under maintenance
+    New = rabbit_maintenance:filter_out_drained_nodes_local_read(Running -- MemberNodes),
     case should_add_node(MemberNodes, New, Q, TargetSize) of
         true ->
             %% In the future, sort the list of new nodes based on load,