diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-08-17 17:45:52 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-08-17 17:45:52 +0100 |
| commit | 848d4e358203a9966a6b24b881d89aeda2b7a46f (patch) | |
| tree | 738b676f9aef13853620072f3b7cbcfe2080908b | |
| parent | 0712501332fafa59e9ba063500be85f0775b5c84 (diff) | |
| download | rabbitmq-server-bug25104.tar.gz | |
So strip all that stuff out.bug25104
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 7d1efd50..89e334dd 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -20,8 +20,6 @@ drop_mirror/2, drop_mirror/3, add_mirror/2, add_mirror/3, report_deaths/4, store_updated_slaves/1]). --export([is_really_alive0/1]). %% For RPC - -include("rabbit.hrl"). %%---------------------------------------------------------------------------- @@ -66,8 +64,7 @@ remove_from_queue(QueueName, DeadPids) -> slave_pids = SPids }] -> [QPid1 | SPids1] = Alive = [Pid || Pid <- [QPid | SPids], - not lists:member(node(Pid), DeadNodes) orelse - is_really_alive(Pid)], + not lists:member(node(Pid), DeadNodes)], case {{QPid, SPids}, {QPid1, SPids1}} of {Same, Same} -> {ok, QPid1, []}; @@ -89,30 +86,6 @@ remove_from_queue(QueueName, DeadPids) -> end end). -%% We want to find out if the pid is alive in case a node restarted -%% quickly and we didn't notice until later (in which case we should -%% do nothing). But if we are dealing with a queue going down because -%% it's in a broker which is shutting down cleanly, its process could -%% still be alive momentarily (since we heard about the death of the -%% *GM* process) so ask the application controller whether rabbit is -%% running - in the above case by the time the controller responds the -%% process will have terminated. -%% -%% See bug 25104. - -is_really_alive(Pid) -> - %% Don't bother optimising the local case since we will only ever - %% call for a remote node - case rpc:call(node(Pid), - rabbit_mirror_queue_misc, is_process_alive0, [Pid]) of - true -> true; - _ -> false - end. - -is_really_alive0(Pid) -> - is_process_alive(Pid) andalso - lists:keymember(rabbit, 1, application:which_applications(infinity)). - on_node_up() -> Qs = rabbit_misc:execute_mnesia_transaction( |