diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-10-10 15:28:49 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-10-10 15:28:49 +0100 |
| commit | c8e2664f60e13f74ebe712f52ddf467f4fd53343 (patch) | |
| tree | ab948184f690adeee6a274ea322ee9768d0170df /src/rabbit_amqqueue.erl | |
| parent | eeb04e43418810e499822eed4b2e88b9e9037471 (diff) | |
| download | rabbitmq-server-bug26408.tar.gz | |
Separate out different is_process_alive implementations depending on whether we want to consider the process alive if it is running but we can't talk to it via Mnesia. Thus unbreak exclusive queues with the direct client from non-Rabbit nodes.bug26408
Diffstat (limited to 'src/rabbit_amqqueue.erl')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index c4abfd9d..68e96742 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -398,7 +398,7 @@ with(Name, F, E) -> %% indicates a code bug and we don't want to get stuck in %% the retry loop. rabbit_misc:with_exit_handler( - fun () -> false = rabbit_misc:is_process_alive(QPid), + fun () -> false = rabbit_mnesia:is_process_alive(QPid), timer:sleep(25), with(Name, F, E) end, fun () -> F(Q) end); @@ -772,7 +772,7 @@ on_node_down(Node) -> slave_pids = []} <- mnesia:table(rabbit_queue), node(Pid) == Node andalso - not rabbit_misc:is_process_alive(Pid)])), + not rabbit_mnesia:is_process_alive(Pid)])), {Qs, Dels} = lists:unzip(QsDels), T = rabbit_binding:process_deletions( lists:foldl(fun rabbit_binding:combine_deletions/2, |