Merge pull request #8829 from rabbitmq/move-forget_cluster_node-generic-steps-to-rabbit_db_cluster

rabbit_db_cluster: Check `rabbit` is stopped in `forget_node()`

Author: dumbbell

deps/rabbit/src/rabbit_db_cluster.erl

@@ -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).

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/forget_cluster_node_command.ex

@@ -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"}