Skip to content

Commit 39776b9

Browse files
committed
Revert "Extend QQ grow command to support target quorum cluster size"
This reverts commit 15ce0b51af294b15f183da57ea2e040362bccbe7.
1 parent 2c813ad commit 39776b9

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

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

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,7 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
4949
{:validation_failure, "strategy '#{s}' is not recognised."}
5050
end
5151

52-
def do_validate([n, _], _)
53-
when (is_integer(n) and n <= 0) do
54-
{:validation_failure, "target quorum cluster size '#{n}' must be greater than 0."}
55-
end
56-
57-
def do_validate([n, _], %{membership: m})
58-
when (is_integer(n) and not (m == "voter" or m == "promotable")) do
59-
{:validation_failure, "voter status '#{m}' must be 'voter' or 'promotable' to grow to target quorum cluster size '#{n}'."}
60-
end
61-
62-
def do_validate(_, %{membership: m})
52+
def validate(_, %{membership: m})
6353
when not (m == "promotable" or
6454
m == "non_voter" or
6555
m == "voter") do
@@ -88,24 +78,15 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
8878
)
8979
end
9080

91-
def run([node_or_quorum_cluster_size, strategy], %{
81+
def run([node, strategy], %{
9282
node: node_name,
9383
vhost_pattern: vhost_pat,
9484
queue_pattern: queue_pat,
9585
membership: membership,
9686
errors_only: errors_only
9787
}) do
9888

99-
node_or_quorum_cluster_size =
100-
case Integer.parse(node_or_quorum_cluster_size) do
101-
{cluster_size, _} when is_integer(cluster_size) ->
102-
cluster_size
103-
104-
:error ->
105-
to_atom(node_or_quorum_cluster_size)
106-
end
107-
108-
args = [node_or_quorum_cluster_size, vhost_pat, queue_pat, to_atom(strategy)]
89+
args = [to_atom(node), vhost_pat, queue_pat, to_atom(strategy)]
10990

11091
args =
11192
case to_atom(membership) do
@@ -146,11 +127,11 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
146127

147128
def usage,
148129
do:
149-
"grow <node | quorum_cluster_size> <all | even> [--vhost-pattern <pattern>] [--queue-pattern <pattern>] [--membership <promotable|voter>]"
130+
"grow <node> <all | even> [--vhost-pattern <pattern>] [--queue-pattern <pattern>] [--membership <promotable|voter>]"
150131

151132
def usage_additional do
152133
[
153-
["<node | quorum_cluster_size>", "node name to place replicas on or desired quorum cluster size"],
134+
["<node>", "node name to place replicas on"],
154135
[
155136
"<all | even>",
156137
"add a member for all matching queues or just those whose membership count is an even number"

0 commit comments

Comments
 (0)