summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-08-20 15:14:09 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-08-20 15:14:09 +0100
commita1bddbe3f3f63e21f564098bf4d0db5be7731338 (patch)
tree709e8274005075be2b979d567dd94cca46e7b260
parentd25b810b3be9186c9e7886a33888780e938ca099 (diff)
downloadrabbitmq-server-a1bddbe3f3f63e21f564098bf4d0db5be7731338.tar.gz
Backport 533141bf7a26 (Merge of bug25104; Bug 24942 broke detection of mirror removal at clean shutdown)rabbitmq_v2_8_6
-rw-r--r--src/rabbit_mirror_queue_misc.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index ba62a734..3901acb0 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -62,9 +62,7 @@ remove_from_queue(QueueName, DeadPids) ->
slave_pids = SPids }] ->
[QPid1 | SPids1] = Alive =
[Pid || Pid <- [QPid | SPids],
- not lists:member(node(Pid),
- DeadNodes) orelse
- rabbit_misc:is_process_alive(Pid)],
+ not lists:member(node(Pid), DeadNodes)],
case {{QPid, SPids}, {QPid1, SPids1}} of
{Same, Same} ->
{ok, QPid1, []};