summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2023-05-07 21:55:22 +0400
committerGitHub <noreply@github.com>2023-05-07 21:55:22 +0400
commit69387b16a5664a6a1435ba05f68462851f4a6029 (patch)
treed5f0c4767615c88b200676832659facd0e00af1c
parentdcd386a2ce39d464855c384d486d7d5ef25782b2 (diff)
parent013628db15fc9334a6505a629459a2ccc98b2afb (diff)
downloadrabbitmq-server-git-69387b16a5664a6a1435ba05f68462851f4a6029.tar.gz
Merge pull request #8123 from rabbitmq/SimonUnge-shrink_on_node_cleanup
Peer discovery: shrink QQ replicas on forced node removal
-rw-r--r--deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl6
1 files changed, 5 insertions, 1 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 6ae37068d1..fcfdf7385d 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,7 +277,11 @@ maybe_remove_nodes([Node | Nodes], false) ->
?LOG_WARNING(
"Peer discovery: removing unknown node ~ts from the cluster", [Node],
#{domain => ?RMQLOG_DOMAIN_PEER_DIS}),
- rabbit_db_cluster:forget_member(Node, false),
+ _ = rabbit_db_cluster:forget_member(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),
maybe_remove_nodes(Nodes, false).
%%--------------------------------------------------------------------