diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-11-15 10:53:10 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2021-11-15 11:07:46 +0100 |
| commit | 91ad44a09630097117fe0fe84ceba3f55678504b (patch) | |
| tree | 437b72c21bc92e9ee532a0a8dc586144c821a56d | |
| parent | 5b095d0e0dd4f9ddef471d2f07fe3260600ac18a (diff) | |
| download | rabbitmq-server-git-91ad44a09630097117fe0fe84ceba3f55678504b.tar.gz | |
Update rabbit_ct_broker_helpers:force_vhost_failure/4 for erpc
https://www.erlang.org/doc/man/erpc.html#call-5
(cherry picked from commit 1f7db0fa35cf408b5588f7701946d4e163b9df8a)
| -rw-r--r-- | deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl | 9 |
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), |