summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-09-05 14:54:17 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-09-05 14:54:17 +0100
commitdc63b6550d0fca9ec60c1fb66f5530923f66fc6d (patch)
tree53b150a8595749f28158586d0a6b72041f21433c
parent1222f40fffaacc43a1741757f084952e260e6d0c (diff)
downloadrabbitmq-server-dc63b6550d0fca9ec60c1fb66f5530923f66fc6d.tar.gz
Also exclude DeadNodes from the list of new nodes to start mirrors on; we have checked for running_clustered_nodes() but that could be out of date.
-rw-r--r--src/rabbit_mirror_queue_misc.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index 5217e276..ad9dfa0d 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -101,7 +101,7 @@ remove_from_queue0(QueueName, DeadGMPids) ->
{_, OldNodes} = actual_queue_nodes(Q1),
{_, NewNodes} = suggested_queue_nodes(Q1),
{ok, QPid1, [QPid | SPids] -- Alive,
- NewNodes -- OldNodes};
+ (NewNodes -- OldNodes) -- DeadNodes};
_ ->
%% Master has changed, and we're not it,
%% so leave alone to allow the promoted