Naming #13643

(cherry picked from commit e6bc6a4)
(cherry picked from commit b0eaa57)

Author: michaelklishin

deps/rabbit/src/rabbit_db_cluster.erl

@@ -227,7 +227,7 @@ join(RemoteNode, NodeType)
                                     "with node ~tp, but ~tp disagrees. ~tp will ask "
                                     "to leave the cluster and try again.",
                                     [RemoteNode, node(), node(), node()]),
-                    ok = rabbit_mnesia:leave_discover_cluster(RemoteNode),
+                    ok = rabbit_mnesia:leave_then_rediscover_cluster(RemoteNode),
                     join(RemoteNode, NodeType)
             end;
         {error, _} = Error ->

deps/rabbit/src/rabbit_mnesia.erl

@@ -73,7 +73,7 @@
 -export([node_info/0, remove_node_if_mnesia_running/1]).
 
 %% Used internally in `rabbit_db_cluster'.
--export([members/0, leave_discover_cluster/1]).
+-export([members/0, leave_then_rediscover_cluster/1]).
 
 %% Used internally in `rabbit_khepri'.
 -export([mnesia_and_msg_store_files/0]).
@@ -893,7 +893,7 @@ remove_node_if_mnesia_running(Node) ->
             end
     end.
 
-leave_discover_cluster(DiscoveryNode) ->
+leave_then_rediscover_cluster(DiscoveryNode) ->
     {ClusterNodes, _, _} = discover_cluster([DiscoveryNode]),
     leave_cluster(rabbit_nodes:nodes_excl_me(ClusterNodes)).