summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <klishinm@vmware.com>2023-05-07 23:00:48 +0400
committerGitHub <noreply@github.com>2023-05-07 23:00:48 +0400
commit8edf0d3be3b8bde1decfcea404a469433f6fc813 (patch)
tree34c1656562dddbcd44f6767a9ae35483ac4ba3af
parentde070452b9d1334212e4a864d382bb32efb0f60f (diff)
parent05a47a08b2006fb69ee5fdf1d590fe07393aee02 (diff)
downloadrabbitmq-server-git-8edf0d3be3b8bde1decfcea404a469433f6fc813.tar.gz
Merge pull request #8125 from rabbitmq/mergify/bp/v3.11.x/pr-8124
Peer discovery: shrink QQ replicas on forced node removal (backport #8123) (backport #8124)
-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 6b86f507bd..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,7 +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}),
- rabbit_mnesia:forget_cluster_node(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),
maybe_remove_nodes(Nodes, false).
%%--------------------------------------------------------------------