diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index b847df2d14..bb61ec8aa7 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -2196,6 +2196,7 @@ run_leader_health_check(ClusterName, QResource, HealthCheckRef, From) -> end, ok. +wait_for_leader_health_checks(_Ref, 0, UnhealthyAcc = []) -> UnhealthyAcc; wait_for_leader_health_checks(Ref, N, UnhealthyAcc) -> receive {ok, Ref, _QResource} when N == 1 -> diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl index d16a421df6..32853f564b 100644 --- a/deps/rabbit/test/quorum_queue_SUITE.erl +++ b/deps/rabbit/test/quorum_queue_SUITE.erl @@ -4153,6 +4153,14 @@ leader_health_check(Config) -> set_up_vhost(Config, VHost1), set_up_vhost(Config, VHost2), + %% check empty vhost + ?assertEqual([], + rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check, + [<<".*">>, VHost1])), + ?assertEqual([], + rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check, + [<<".*">>, global])), + Conn1 = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 0, VHost1), {ok, Ch1} = amqp_connection:open_channel(Conn1),