Skip to content

Commit 7873737

Browse files
committed
Return immediately for leader health checks on empty vhosts
1 parent 48ba3e1 commit 7873737

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2196,6 +2196,7 @@ run_leader_health_check(ClusterName, QResource, HealthCheckRef, From) ->
21962196
end,
21972197
ok.
21982198

2199+
wait_for_leader_health_checks(_Ref, 0, UnhealthyAcc = []) -> UnhealthyAcc;
21992200
wait_for_leader_health_checks(Ref, N, UnhealthyAcc) ->
22002201
receive
22012202
{ok, Ref, _QResource} when N == 1 ->

deps/rabbit/test/quorum_queue_SUITE.erl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4153,6 +4153,14 @@ leader_health_check(Config) ->
41534153
set_up_vhost(Config, VHost1),
41544154
set_up_vhost(Config, VHost2),
41554155

4156+
%% check empty vhost
4157+
?assertEqual([],
4158+
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
4159+
[<<".*">>, VHost1])),
4160+
?assertEqual([],
4161+
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
4162+
[<<".*">>, global])),
4163+
41564164
Conn1 = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 0, VHost1),
41574165
{ok, Ch1} = amqp_connection:open_channel(Conn1),
41584166

0 commit comments

Comments
 (0)