From f849a605eec9e72e92dddc4dfcf49e9cdb3b28f7 Mon Sep 17 00:00:00 2001 From: Diana Parra Corbacho Date: Wed, 11 Sep 2024 09:07:32 +0200 Subject: [PATCH 1/2] Increase the timeout when batch deleting permissions --- deps/rabbit/src/rabbit_db_user.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit/src/rabbit_db_user.erl b/deps/rabbit/src/rabbit_db_user.erl index af72080be9c..e1589db3d08 100644 --- a/deps/rabbit/src/rabbit_db_user.erl +++ b/deps/rabbit/src/rabbit_db_user.erl @@ -640,7 +640,7 @@ clear_all_permissions_for_vhost_in_khepri(VHostName) -> TopicProps, rabbit_khepri:collect_payloads(UserProps)), {ok, Deletions} - end, rw). + end, rw, #{timeout => infinity}). %% ------------------------------------------------------------------- %% get_topic_permissions(). From 2981782161ffe05fbe7097635c32e06300ece1bb Mon Sep 17 00:00:00 2001 From: Diana Parra Corbacho Date: Thu, 12 Sep 2024 08:34:44 +0200 Subject: [PATCH 2/2] cluster_minority_SUITE: use a timeout for vhost deletion --- deps/rabbit/test/cluster_minority_SUITE.erl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deps/rabbit/test/cluster_minority_SUITE.erl b/deps/rabbit/test/cluster_minority_SUITE.erl index 3267b29b7bd..93ce3b72f29 100644 --- a/deps/rabbit/test/cluster_minority_SUITE.erl +++ b/deps/rabbit/test/cluster_minority_SUITE.erl @@ -245,7 +245,11 @@ update_vhost(Config) -> [<<"/">>, [carrots], <<"user">>])). delete_vhost(Config) -> - ?assertMatch({'EXIT', _}, rabbit_ct_broker_helpers:delete_vhost(Config, <<"vhost1">>)). + ?assertError( + {erpc, timeout}, + rabbit_ct_broker_helpers:rpc( + Config, 0, + rabbit_vhost, delete, [<<"vhost1">>, <<"acting-user">>], 1_000)). add_user(Config) -> ?assertMatch({error, timeout},