diff options
author | Emile Joubert <emile@rabbitmq.com> | 2012-08-20 15:14:09 +0100 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2012-08-20 15:14:09 +0100 |
commit | 2c711a1715927ec020f017c32110638b9a5a3af8 (patch) | |
tree | 709e8274005075be2b979d567dd94cca46e7b260 | |
parent | 0ea9eb16979f5b6c81165d9678fcdb3125e2ae08 (diff) | |
download | rabbitmq-server-git-2c711a1715927ec020f017c32110638b9a5a3af8.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.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index ba62a7346f..3901acb058 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, []}; |