root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Make 'rabbitmq-queues await_online_quorum_plus_one' a no-op for single node clusters 

since it does not make sense in that case
This commit is contained in:
Michael Klishin 2021-03-13 00:47:23 +03:00
parent 8b203e316e
commit 2fcb282633
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
deps/rabbitmq_cli/lib/rabbitmq/cli/upgrade/commands/await_online_quorum_plus_one_command.ex vendored
View File

@ -6,6 +6,7 @@
defmodule RabbitMQ.CLI.Upgrade.Commands.AwaitOnlineQuorumPlusOneCommand do defmodule RabbitMQ.CLI.Upgrade.Commands.AwaitOnlineQuorumPlusOneCommand do
alias RabbitMQ.CLI.Core.DocGuide alias RabbitMQ.CLI.Core.DocGuide
import RabbitMQ.CLI.Core.Config, only: [output_less?: 1]
@behaviour RabbitMQ.CLI.CommandBehaviour @behaviour RabbitMQ.CLI.CommandBehaviour
@ -28,19 +29,38 @@ defmodule RabbitMQ.CLI.Upgrade.Commands.AwaitOnlineQuorumPlusOneCommand do
def run([], %{node: node_name, timeout: timeout}) do def run([], %{node: node_name, timeout: timeout}) do
rpc_timeout = timeout + 500 rpc_timeout = timeout + 500
case :rabbit_misc.rpc_call(node_name, :rabbit_upgrade_preparation, :await_online_quorum_plus_one, [timeout], rpc_timeout) do case :rabbit_misc.rpc_call(node_name, :rabbit_nodes, :is_single_node_cluster, [], rpc_timeout) do
{:error, _} = err -> err # if target node is the only one in the cluster, the command makes little sense
{:error, _, _} = err -> err # and false positives can be misleading
{:badrpc, _} = err -> err true -> {:ok, :single_node_cluster}
false ->
case :rabbit_misc.rpc_call(node_name, :rabbit_upgrade_preparation, :await_online_quorum_plus_one, [timeout], rpc_timeout) do
{:error, _} = err -> err
{:error, _, _} = err -> err
{:badrpc, _} = err -> err
true -> :ok true -> :ok
false -> {:error, "time is up, no quorum + 1 online replicas came online for at least some quorum queues"} false -> {:error, "time is up, no quorum + 1 online replicas came online for at least some quorum queues"}
end
other -> other
end end
end end
def output({:ok, :single_node_cluster}, %{formatter: "json"}) do
{:ok, %{
"result" => "ok",
"message" => "Target node seems to be the only one in a single node cluster, the check does not apply"
}}
end
def output({:error, msg}, %{node: node_name, formatter: "json"}) do def output({:error, msg}, %{node: node_name, formatter: "json"}) do
{:error, %{"result" => "error", "node" => node_name, "message" => msg}} {:error, %{"result" => "error", "node" => node_name, "message" => msg}}
end end
def output({:ok, :single_node_cluster}, opts) do
case output_less?(opts) do
true -> :ok;
false -> {:ok, "Target node seems to be the only one in a single node cluster, the command does not apply"}
end
end
use RabbitMQ.CLI.DefaultOutput use RabbitMQ.CLI.DefaultOutput
def usage, do: "await_online_quorum_plus_one" def usage, do: "await_online_quorum_plus_one"