root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Naming #13643

This commit is contained in:
Michael Klishin 2025-04-01 12:13:43 -04:00
parent 36eb6cafc1
commit e6bc6a451f
No known key found for this signature in database
GPG Key ID: 44BF2725475205B2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/src/rabbit_db_cluster.erl vendored
View File

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

4
deps/rabbit/src/rabbit_mnesia.erl vendored
View File

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