add back-compatible CLI calls

Author: Alex Valiushko

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -48,6 +48,7 @@
 -export([format_ra_event/3]).
 -export([cleanup_data_dir/0]).
 -export([shrink_all/1,
+         grow/4,
          grow/5]).
 -export([transfer_leadership/2, get_replicas/1, queue_length/1]).
 -export([file_handle_leader_reservation/1,
@@ -82,6 +83,7 @@
 -include_lib("stdlib/include/qlc.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
 -include("amqqueue.hrl").
+-include("vhost.hrl").
 
 -type msg_id() :: non_neg_integer().
 -type qmsg() :: {rabbit_types:r('queue'), pid(), msg_id(), boolean(),
@@ -1150,7 +1152,7 @@ get_sys_status(Proc) ->
 
     end.
 
-add_member(VHost, Name, Node, VoterStatus, Timeout) ->
+add_member(VHost, Name, Node, Membership, Timeout) when ?is_vhost(VHost) ->
     QName = #resource{virtual_host = VHost, name = Name, kind = queue},
     rabbit_log:debug("Asked to add a replica for queue ~ts on node ~ts", [rabbit_misc:rs(QName), Node]),
     case rabbit_amqqueue:lookup(QName) of
@@ -1168,7 +1170,7 @@ add_member(VHost, Name, Node, VoterStatus, Timeout) ->
                           rabbit_log:debug("Quorum ~ts already has a replica on node ~ts", [rabbit_misc:rs(QName), Node]),
                           ok;
                         false ->
-                            add_member(Q, Node, VoterStatus, Timeout)
+                            add_member(Q, Node, Membership, Timeout)
                     end
             end;
         {ok, _Q} ->
@@ -1183,6 +1185,9 @@ add_member(Q, Node) ->
 add_member(Q, Node, Membership) ->
     add_member(Q, Node, Membership, ?ADD_MEMBER_TIMEOUT).
 
+add_member(VHost, Name, Node, Timeout) when ?is_vhost(VHost) ->
+    %% NOTE needed to pass mixed cluster tests.
+    add_member(VHost, Name, Node, promotable, Timeout);
 add_member(Q, Node, Membership, Timeout) when ?amqqueue_is_quorum(Q) ->
     {RaName, _} = amqqueue:get_pid(Q),
     QName = amqqueue:get_name(Q),
@@ -1305,10 +1310,14 @@ shrink_all(Node) ->
             amqqueue:get_type(Q) == ?MODULE,
             lists:member(Node, get_nodes(Q))].
 
+
+ grow(Node, VhostSpec, QueueSpec, Strategy) ->
+    grow(Node, VhostSpec, QueueSpec, Strategy, promotable).
+
 -spec grow(node(), binary(), binary(), all | even, membership()) ->
     [{rabbit_amqqueue:name(),
       {ok, pos_integer()} | {error, pos_integer(), term()}}].
- grow(Node, VhostSpec, QueueSpec, Membership, Strategy) ->
+ grow(Node, VhostSpec, QueueSpec, Strategy, Membership) ->
     Running = rabbit_nodes:list_running(),
     [begin
          Size = length(get_nodes(Q)),

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/add_member_command.ex

@@ -73,13 +73,15 @@ defmodule RabbitMQ.CLI.Queues.Commands.AddMemberCommand do
         [name, node] = _args,
         %{vhost: vhost, node: node_name, timeout: timeout, membership: membership}
       ) do
-    case :rabbit_misc.rpc_call(node_name, :rabbit_quorum_queue, :add_member, [
-           vhost,
-           name,
-           to_atom(node),
-           to_atom(membership),
-           timeout
-         ]) do
+    args = [vhost, name, to_atom(node)]
+
+    args =
+      case to_atom(membership) do
+        :promotable -> args ++ [timeout]
+        other -> args ++ [other, timeout]
+      end
+
+    case :rabbit_misc.rpc_call(node_name, :rabbit_quorum_queue, :add_member, args) do
       {:error, :classic_queue_not_supported} ->
         {:error, "Cannot add members to a classic queue"}
 

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/grow_command.ex

@@ -67,13 +67,15 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
         membership: membership,
         errors_only: errors_only
       }) do
-    case :rabbit_misc.rpc_call(node_name, :rabbit_quorum_queue, :grow, [
-           to_atom(node),
-           vhost_pat,
-           queue_pat,
-           to_atom(membership),
-           to_atom(strategy)
-         ]) do
+    args = [to_atom(node), vhost_pat, queue_pat, to_atom(strategy)]
+
+    args =
+      case to_atom(membership) do
+        :promotable -> args
+        other -> args ++ [other]
+      end
+
+    case :rabbit_misc.rpc_call(node_name, :rabbit_quorum_queue, :grow, args) do
       {:error, _} = error ->
         error
 

deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl

@@ -43,7 +43,12 @@ accept_content(ReqData, Context) ->
       rabbit_amqqueue:with(
         rabbit_misc:r(VHost, queue, QName),
         fun(_Q) ->
-          rabbit_quorum_queue:add_member(VHost, QName, rabbit_data_coercion:to_atom(NewReplicaNode), Membership, ?TIMEOUT)
+                rabbit_quorum_queue:add_member(
+                  VHost,
+                  QName,
+                  rabbit_data_coercion:to_atom(NewReplicaNode),
+                  rabbit_data_coercion:to_atom(Membership),
+                  ?TIMEOUT)
         end)
     end),
   case Res of

deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl

@@ -45,8 +45,8 @@ accept_content(ReqData, Context) ->
         rabbit_data_coercion:to_atom(NewReplicaNode),
         VHPattern,
         QPattern,
-        rabbit_data_coercion:to_atom(Membership),
-        rabbit_data_coercion:to_atom(Strategy))
+        rabbit_data_coercion:to_atom(Strategy),
+        rabbit_data_coercion:to_atom(Membership))
     end),
   {true, ReqData, Context}.