diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-29 12:46:47 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-29 12:46:47 +0000 |
| commit | 7ebb283bdce77b248b81acd47bdd1e98d9fb01e0 (patch) | |
| tree | 7ebec96148d6fac304ba77337a7d32cf65bd3758 | |
| parent | eb219699cfefaba0704a62cc5c46cfaac8601abc (diff) | |
| download | rabbitmq-server-git-7ebb283bdce77b248b81acd47bdd1e98d9fb01e0.tar.gz | |
Remove if_mirrored_queue/2, it's not buying us anything in terms of avoiding races.
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 92ccc79d6e..ec00ecef96 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -141,7 +141,7 @@ drop_mirrors(QName, Nodes) -> ok. drop_mirror(QName, MirrorNode) -> - if_mirrored_queue( + rabbit_amqqueue:with( QName, fun (#amqqueue { name = Name, pid = QPid, slave_pids = SPids }) -> case [Pid || Pid <- [QPid | SPids], node(Pid) =:= MirrorNode] of @@ -163,7 +163,7 @@ add_mirrors(QName, Nodes) -> ok. add_mirror(QName, MirrorNode) -> - if_mirrored_queue( + rabbit_amqqueue:with( QName, fun (#amqqueue { name = Name, pid = QPid, slave_pids = SPids } = Q) -> case [Pid || Pid <- [QPid | SPids], node(Pid) =:= MirrorNode] of @@ -206,14 +206,6 @@ start_child(Name, MirrorNode, Q) -> Other end. -if_mirrored_queue(QName, Fun) -> - rabbit_amqqueue:with(QName, fun (Q) -> - case is_mirrored(Q) of - false -> ok; - true -> Fun(Q) - end - end). - report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) -> |