rabbitmq_cli: Handle absence of the rabbit_db* modules in older versions

Author: dumbbell

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

@@ -39,7 +39,13 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ForgetClusterNodeCommand do
       become(node_name, opts),
       RabbitMQ.CLI.Core.Helpers.defer(fn ->
         _ = :rabbit_event.start_link()
-        :rabbit_db_cluster.forget_member(to_atom(node_to_remove), true)
+
+        try do
+          :rabbit_db_cluster.forget_member(to_atom(node_to_remove), true)
+        catch
+          :error, :undef ->
+            :rabbit_mnesia.forget_cluster_node(to_atom(node_to_remove), true)
+        end
       end)
     ])
   end
@@ -66,6 +72,9 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ForgetClusterNodeCommand do
         {: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, unavailable}} ->
+        {:error, "Node #{node_to_remove} must be running before it can be removed"}
+
       {:error, _} = error ->
         error
 

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

@@ -17,12 +17,17 @@ defmodule RabbitMQ.CLI.Ctl.Commands.UpdateClusterNodesCommand do
     long_or_short_names = Config.get_option(:longnames, options)
     seed_node_normalised = Helpers.normalise_node(seed_node, long_or_short_names)
 
-    :rabbit_misc.rpc_call(
-      node_name,
-      :rabbit_mnesia,
-      :update_cluster_nodes,
-      [seed_node_normalised]
-    )
+    case :rabbit_misc.rpc_call(node_name, :rabbit_db_cluster, :update_cluster_nodes, [
+           seed_node_normalised
+         ]) do
+      {:badrpc, {:EXIT, {:undef, _}}} ->
+        :rabbit_misc.rpc_call(node_name, :rabbit_mnesia, :update_cluster_nodes, [
+          seed_node_normalised
+        ])
+
+      ret0 ->
+        ret0
+    end
   end
 
   def usage() do

deps/rabbitmq_cli/mix.exs

@@ -30,6 +30,7 @@ defmodule RabbitMQCtl.MixfileBase do
           :rabbit,
           :rabbit_control_misc,
           :rabbit_data_coercion,
+          :rabbit_db_cluster,
           :rabbit_env,
           :rabbit_event,
           :rabbit_file,