Skip to content

Commit bad78a6

Browse files
Ayanda-Dmergify[bot]
authored andcommitted
Implement force_vhost_queues_shrink_member_to_current_member/1
(cherry picked from commit c26aa3b) (cherry picked from commit b03637f) # Conflicts: # deps/rabbit/src/rabbit_quorum_queue.erl
1 parent 92bc7ac commit bad78a6

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,12 +1980,20 @@ force_shrink_member_to_current_member(VHost, Name) ->
19801980
end.
19811981

19821982
force_vhost_queues_shrink_member_to_current_member(VHost) when is_binary(VHost) ->
1983+
<<<<<<< HEAD
19831984
rabbit_log:warning("Shrinking all quorum queues in vhost '~ts' to a single node: ~ts", [VHost, node()]),
1985+
=======
1986+
rabbit_log:warning("Disaster recovery procedure: shrinking all quorum queues in vhost ~tp to a single node cluster", [VHost]),
1987+
>>>>>>> b03637f8ec (Implement force_vhost_queues_shrink_member_to_current_member/1)
19841988
ListQQs = fun() -> rabbit_amqqueue:list(VHost) end,
19851989
force_all_queues_shrink_member_to_current_member(ListQQs).
19861990

19871991
force_all_queues_shrink_member_to_current_member() ->
1992+
<<<<<<< HEAD
19881993
rabbit_log:warning("Shrinking all quorum queues to a single node: ~ts", [node()]),
1994+
=======
1995+
rabbit_log:warning("Disaster recovery procedure: shrinking all quorum queues to a single node cluster"),
1996+
>>>>>>> b03637f8ec (Implement force_vhost_queues_shrink_member_to_current_member/1)
19891997
ListQQs = fun() -> rabbit_amqqueue:list() end,
19901998
force_all_queues_shrink_member_to_current_member(ListQQs).
19911999

@@ -2008,11 +2016,15 @@ force_all_queues_shrink_member_to_current_member(ListQQFun) when is_function(Lis
20082016
end,
20092017
_ = rabbit_amqqueue:update(QName, Fun),
20102018
_ = [ra:force_delete_server(?RA_SYSTEM, {RaName, N}) || N <- OtherNodes]
2019+
<<<<<<< HEAD
20112020
<<<<<<< HEAD
20122021
end || Q <- ListQQFun(), amqqueue:get_type(Q) == ?MODULE],
20132022
rabbit_log:warning("Shrinking finished"),
20142023
=======
20152024
end || Q <- rabbit_amqqueue:list(), amqqueue:get_type(Q) == ?MODULE],
2025+
=======
2026+
end || Q <- ListQQFun(), amqqueue:get_type(Q) == ?MODULE],
2027+
>>>>>>> b03637f8ec (Implement force_vhost_queues_shrink_member_to_current_member/1)
20162028
rabbit_log:warning("Disaster recovery procedure: shrinking finished"),
20172029
>>>>>>> d9de6d989c (Shutdown peer QQ FSMs on connected nodes on force-shrink execution for cluster)
20182030
ok.

0 commit comments

Comments
 (0)