From e6bc6a451fbb0d91940a5a7933a55d95ed7505c9 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Tue, 1 Apr 2025 12:13:43 -0400 Subject: [PATCH] Naming #13643 --- deps/rabbit/src/rabbit_db_cluster.erl | 2 +- deps/rabbit/src/rabbit_mnesia.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/rabbit/src/rabbit_db_cluster.erl b/deps/rabbit/src/rabbit_db_cluster.erl index 0fa3f18411..a11ba80af4 100644 --- a/deps/rabbit/src/rabbit_db_cluster.erl +++ b/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 -> diff --git a/deps/rabbit/src/rabbit_mnesia.erl b/deps/rabbit/src/rabbit_mnesia.erl index 61a0e851f7..89ef6e726b 100644 --- a/deps/rabbit/src/rabbit_mnesia.erl +++ b/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]). @@ -922,7 +922,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)).