diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-08-23 11:36:06 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-08-23 11:36:06 +0100 |
| commit | 6d6ffaf4487d40ecafcc94bbe7b44b3f0a0b762a (patch) | |
| tree | 1fd0722aae0451fc01d56034b451d797dfc9ec5e | |
| parent | 0e2442db25cc4d4aae6df6e440315ef583320a11 (diff) | |
| download | rabbitmq-server-git-6d6ffaf4487d40ecafcc94bbe7b44b3f0a0b762a.tar.gz | |
Fix broken merge
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 203ad651e9..e4591ccabb 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -76,11 +76,11 @@ remove_from_queue0(QueueName, DeadGMPids) -> %% get here. case mnesia:read({rabbit_queue, QueueName}) of [] -> {error, not_found}; - [Q = #amqqueue { name = QName, - pid = QPid, + [Q = #amqqueue { pid = QPid, slave_pids = SPids }] -> Alive = [Pid || Pid <- [QPid | SPids], not lists:member(node(Pid), DeadNodes)], + {QPid1, SPids1} = promote_slave(Alive), case {{QPid, SPids}, {QPid1, SPids1}} of {Same, Same} -> {ok, QPid1, [], []}; |