diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-08-09 09:14:15 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-08-09 09:14:15 -0700 |
| commit | af397dd1b42eaf44f7213f847fed6c0135812e20 (patch) | |
| tree | 347c86ac2f8170e2750698530cf6c0b4a51673b4 /src | |
| parent | 23884dd83be137c356d4ae3ec19c7bc686118573 (diff) | |
| download | rabbitmq-server-git-af397dd1b42eaf44f7213f847fed6c0135812e20.tar.gz | |
Add test for cleaning up dead exclusive queues
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 8b1159e8db..467cd998bc 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -35,7 +35,7 @@ -export([on_node_up/1, on_node_down/1]). -export([update/2, store_queue/1, update_decorators/1, policy_changed/2]). -export([update_mirroring/1, sync_mirrors/1, cancel_sync_mirrors/1]). --export([is_mirrored/1, is_exclusive/1]). % Note: exported due to use in qlc expression. +-export([is_mirrored/1, is_dead_exclusive/1]). % Note: exported due to use in qlc expression. -export([pid_of/1, pid_of/2]). @@ -920,10 +920,10 @@ cancel_sync_mirrors(QPid) -> delegate:call(QPid, cancel_sync_mi is_mirrored(Q) -> rabbit_mirror_queue_misc:is_mirrored(Q). -is_exclusive(#amqqueue{exclusive_owner = none}) -> +is_dead_exclusive(#amqqueue{exclusive_owner = none}) -> false; -is_exclusive(#amqqueue{exclusive_owner = Pid}) when is_pid(Pid) -> - true. +is_dead_exclusive(#amqqueue{exclusive_owner = Pid}) when is_pid(Pid) -> + not rabbit_mnesia:is_process_alive(Pid). on_node_up(Node) -> ok = rabbit_misc:execute_mnesia_transaction( @@ -974,7 +974,7 @@ on_node_down(Node) -> node(Pid) == Node andalso not rabbit_mnesia:is_process_alive(Pid) andalso (not rabbit_amqqueue:is_mirrored(Q) orelse - rabbit_amqqueue:is_exclusive(Q))])), + rabbit_amqqueue:is_dead_exclusive(Q))])), {Qs, Dels} = lists:unzip(QsDels), T = rabbit_binding:process_deletions( lists:foldl(fun rabbit_binding:combine_deletions/2, |