diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-09-11 10:54:02 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-09-11 10:54:02 +0100 |
commit | acc7038fde6c9f244a4a0b8188cc293c1cbbe33c (patch) | |
tree | 774d6286a28184af4d7846f13179833bc74f6b87 | |
parent | 01138a540397d641497224ccbbe14eedc4571e6a (diff) | |
download | rabbitmq-server-acc7038fde6c9f244a4a0b8188cc293c1cbbe33c.tar.gz |
You should be able to delete a vhost containing a crashed queue too.bug21446
-rw-r--r-- | src/rabbit_vhost.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index 2c1e15f0..18d44225 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -97,10 +97,9 @@ delete(VHostPath) -> assert_benign(ok) -> ok; assert_benign({ok, _}) -> ok; assert_benign({error, not_found}) -> ok; -assert_benign({error, {absent, Q, nodedown}}) -> - %% We have a durable queue on a down node. Removing the mnesia - %% entries here is safe. If/when the down node restarts, it will - %% clear out the on-disk storage of the queue. +assert_benign({error, {absent, Q, _}}) -> + %% Removing the mnesia entries here is safe. If/when the down node + %% restarts, it will clear out the on-disk storage of the queue. case rabbit_amqqueue:internal_delete(Q#amqqueue.name) of ok -> ok; {error, not_found} -> ok |