Skip to content

rabbit_db_cluster: Check rabbit is stopped in forget_node() #8829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions deps/rabbit/src/rabbit_db_cluster.erl
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,17 @@ join_using_mnesia(ClusterNodes, NodeType) when is_list(ClusterNodes) ->
%% @doc Removes `Node' from the cluster.

forget_member(Node, RemoveWhenOffline) ->
rabbit_db:run(
#{mnesia =>
fun() -> forget_member_using_mnesia(Node, RemoveWhenOffline) end}).
case rabbit:is_running(Node) of
false ->
rabbit_db:run(
#{mnesia => fun() ->
forget_member_using_mnesia(
Node, RemoveWhenOffline)
end
});
true ->
{error, {failed_to_remove_node, Node, rabbit_still_running}}
end.

forget_member_using_mnesia(Node, RemoveWhenOffline) ->
rabbit_mnesia:forget_cluster_node(Node, RemoveWhenOffline).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ForgetClusterNodeCommand do
end

case ret do
{:error, {:failed_to_remove_node, ^atom_name, :rabbit_still_running}} ->
{:error,
"RabbitMQ on node #{node_to_remove} must be stopped with 'rabbitmqctl -n #{node_to_remove} stop_app' before it can be removed"}

{:error, {:failed_to_remove_node, ^atom_name, {:active, _, _}}} ->
{:error,
"RabbitMQ on node #{node_to_remove} must be stopped with 'rabbitmqctl -n #{node_to_remove} stop_app' before it can be removed"}
Expand Down