Resolve a conflict, adapt to v4.1.x #13548 #13938

Author: michaelklishin

deps/rabbit/src/amqqueue.erl

@@ -29,6 +29,7 @@
          % exclusive_owner
          get_exclusive_owner/1,
          get_leader/1,
+         get_nodes/1,
          % name (#resource)
          get_name/1,
          set_name/2,
@@ -391,6 +392,24 @@ get_exclusive_owner(#amqqueue{exclusive_owner = Owner}) ->
 
 get_leader(#amqqueue{type = rabbit_quorum_queue, pid = {_, Leader}}) -> Leader.
 
+-spec get_leader_node(amqqueue_v2()) -> node() | none.
+
+%% Introduced in rabbitmq/rabbitmq-server#13905 for 4.2.0,
+%% used in v4.1.x as of rabbitmq/rabbitmq-server#13548. MK.
+get_leader_node(#amqqueue{pid = {_, Leader}}) -> Leader;
+get_leader_node(#amqqueue{pid = none}) -> none;
+get_leader_node(#amqqueue{pid = Pid}) -> node(Pid).
+
+-spec get_nodes(amqqueue_v2()) -> [node(),...].
+
+get_nodes(Q) ->
+    case amqqueue:get_type_state(Q) of
+        #{nodes := Nodes} ->
+            Nodes;
+        _ ->
+            [get_leader_node(Q)]
+    end.
+
 % operator_policy
 
 -spec get_operator_policy(amqqueue()) -> binary() | none | undefined.

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -77,17 +77,8 @@
          force_vhost_queues_shrink_member_to_current_member/1,
          force_all_queues_shrink_member_to_current_member/0]).
 
-<<<<<<< HEAD
-=======
--export([policy_apply_to_name/0,
-         drain/1,
-         revive/0,
-         queue_vm_stats_sups/0,
-         queue_vm_ets/0]).
-
 -export([force_checkpoint/2, force_checkpoint_on_queue/1]).
 
->>>>>>> 0d3dfd969 (Add force checkpoint functions for quorum queues and command line tool)
 %% for backwards compatibility
 -export([file_handle_leader_reservation/1,
          file_handle_other_reservation/0,