summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kuryloski <kuryloskip@vmware.com>2021-11-15 10:53:10 +0100
committerPhilip Kuryloski <kuryloskip@vmware.com>2021-11-15 10:53:10 +0100
commit1f7db0fa35cf408b5588f7701946d4e163b9df8a (patch)
tree71518a49c8cb024272c9b58c5cc22371ea87f38d
parentd3dcc782f2e08d38687f908192ee9e0fde06046c (diff)
downloadrabbitmq-server-git-1f7db0fa35cf408b5588f7701946d4e163b9df8a.tar.gz
Update rabbit_ct_broker_helpers:force_vhost_failure/4 for erpc
https://www.erlang.org/doc/man/erpc.html#call-5
-rw-r--r--deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl b/deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl
index 420716990e..86a33146bb 100644
--- a/deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl
+++ b/deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl
@@ -1285,12 +1285,13 @@ force_vhost_failure(Config, Node, VHost, Attempts) ->
force_vhost_failure(Config, Node, VHost, Attempts - 1)
catch
%% The vhost terminated while we were checking again.
- exception:{shutdown, _} ->
+ exit:{exception, {shutdown, _}} ->
timer:sleep(300),
force_vhost_failure(Config, Node, VHost, Attempts - 1);
- exception:{badmatch,
- {error,
- {vhost_supervisor_not_running, VHost}}} ->
+ exit:{exception,
+ {badmatch,
+ {error,
+ {vhost_supervisor_not_running, VHost}}}} ->
%% This badmatch may occur in get_message_store_pid/3 as a
%% result of `{ok, VHostSup} = rpc(...)`.
timer:sleep(300),