From 0c649b3687aaf49539659de392b4d8891cb7c648 Mon Sep 17 00:00:00 2001 From: Simon Unge Date: Sun, 7 May 2023 11:48:30 -0400 Subject: See #2882. Also call quorum shrink command --- .../src/rabbit_peer_discovery_cleanup.erl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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..a478811ab1 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,13 @@ 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), + case rabbit_db_cluster:forget_member(Node, false) of + ok -> + ?LOG_WARNING( + "Peer discovery: removing member replica node ~ts from group", [Node], + #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), + rabbit_quorum_queue:shrink_all(Node) + end, maybe_remove_nodes(Nodes, false). %%-------------------------------------------------------------------- -- cgit v1.2.1 From 4da3ae0e0507d94d3d2b39a770a08699b73fc094 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sun, 7 May 2023 21:20:52 +0400 Subject: Wording --- .../src/rabbit_peer_discovery_cleanup.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a478811ab1..9b967c05f6 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 @@ -280,7 +280,7 @@ maybe_remove_nodes([Node | Nodes], false) -> case rabbit_db_cluster:forget_member(Node, false) of ok -> ?LOG_WARNING( - "Peer discovery: removing member replica node ~ts from group", [Node], + "Peer discovery: removing all quorum queue replicas on node ~ts", [Node], #{domain => ?RMQLOG_DOMAIN_PEER_DIS}), rabbit_quorum_queue:shrink_all(Node) end, -- cgit v1.2.1 From 3835a137d6b42c9e1bdfb762c6615220b2a5b24c Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sun, 7 May 2023 21:25:03 +0400 Subject: Intentionally ignore return value here the node is being removed --- .../src/rabbit_peer_discovery_cleanup.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9b967c05f6..a50cc187db 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 @@ -282,7 +282,7 @@ maybe_remove_nodes([Node | Nodes], 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) + _ = rabbit_quorum_queue:shrink_all(Node) end, maybe_remove_nodes(Nodes, false). -- cgit v1.2.1 From 013628db15fc9334a6505a629459a2ccc98b2afb Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Sun, 7 May 2023 21:31:36 +0400 Subject: Pass Dialyzer --- .../src/rabbit_peer_discovery_cleanup.erl | 12 +++++------- 1 file changed, 5 insertions(+), 7 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 a50cc187db..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,13 +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}), - 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, + _ = 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). %%-------------------------------------------------------------------- -- cgit v1.2.1