diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2023-05-07 22:46:21 +0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-05-07 18:55:33 +0000 |
| commit | 05a47a08b2006fb69ee5fdf1d590fe07393aee02 (patch) | |
| tree | 34c1656562dddbcd44f6767a9ae35483ac4ba3af | |
| parent | b8c7028b537c0f81420968a0ec40986b9633fbb8 (diff) | |
| download | rabbitmq-server-git-05a47a08b2006fb69ee5fdf1d590fe07393aee02.tar.gz | |
Resolve conflicts (#8122)
(cherry picked from commit 64a8ed5fa95a8a4b8689d42ad9c0f7161ff9394f)
| -rw-r--r-- | deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl index 3350aff3b0..49ee4243eb 100644 --- a/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl +++ b/deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl @@ -277,25 +277,11 @@ maybe_remove_nodes([Node | Nodes], false) -> ?LOG_WARNING( "Peer discovery: removing unknown node ~s from the cluster", [Node], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), -<<<<<<< HEAD -<<<<<<< HEAD - rabbit_mnesia:forget_cluster_node(Node, false), -======= - case rabbit_db_cluster:forget_member(Node, false) of - ok -> - ?LOG_WARNING( - "Peer discovery: removing all quorum queue replicas on node ~ts", [Node], - #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), - _ = rabbit_quorum_queue:shrink_all(Node) - end, ->>>>>>> 0c649b3687 (See #2882. Also call quorum shrink command) -======= - _ = rabbit_db_cluster:forget_member(Node, false), + _ = rabbit_mnesia:forget_cluster_node(Node, false), ?LOG_WARNING( "Peer discovery: removing all quorum queue replicas on node ~ts", [Node], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), - _ = rabbit_quorum_queue:shrink_all(Node), ->>>>>>> 013628db15 (Pass Dialyzer) + _ = rabbit_quorum_queue:shrink_all(Node), maybe_remove_nodes(Nodes, false). %%-------------------------------------------------------------------- |