From 598e7e24fbd6529f71e33f48cdbecc5b437c050e Mon Sep 17 00:00:00 2001
From: Tim Watson <tim@rabbitmq.com>
Date: Mon, 23 Jul 2012 16:26:52 +0100
Subject: attempt to handle races between remove_from_queue and
 rmq_slave:init/1

---
 src/rabbit_amqqueue.erl          | 1 -
 src/rabbit_mirror_queue_misc.erl | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 8b82fbae..d82ac266 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -594,7 +594,6 @@ set_maximum_since_use(QPid, Age) ->
 on_node_down(Node) ->
     rabbit_misc:execute_mnesia_tx_with_tail(
       fun () -> QsDels =
-                    %% BUG-24942/3: could one of these pids could be stale!?
                     qlc:e(qlc:q([{{QName, Pid}, delete_queue(QName)} ||
                                     #amqqueue{name = QName, pid = Pid,
                                               slave_pids = []}
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index 2c1885d4..31d85561 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -62,7 +62,9 @@ remove_from_queue(QueueName, DeadPids) ->
                                    slave_pids   = SPids }] ->
                       [QPid1 | SPids1] = Alive =
                           [Pid || Pid <- [QPid | SPids],
-                                  not lists:member(node(Pid), DeadNodes)],
+                                  not lists:member(node(Pid),
+                                                   DeadNodes) orelse
+                                  rabbit_misc:is_process_alive(Pid)],
                       case {{QPid, SPids}, {QPid1, SPids1}} of
                           {Same, Same} ->
                               {ok, QPid1, []};
-- 
cgit v1.2.1