diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-12-06 17:00:37 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-12-06 17:00:37 +0000 |
| commit | c9666a0ae4fec4ea2b73a067d5c58376108acd0b (patch) | |
| tree | c9d3a009e7d80a23ca310b5d3b86315a77cfc22a | |
| parent | 01c21a1fac5b5b44f5dd1ee66bcd05ee1f8155c8 (diff) | |
| download | rabbitmq-server-git-c9666a0ae4fec4ea2b73a067d5c58376108acd0b.tar.gz | |
Make syncing idempotent.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index ae96f73999..3169948bab 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -174,8 +174,7 @@ -spec(start_mirroring/1 :: (pid()) -> 'ok'). -spec(stop_mirroring/1 :: (pid()) -> 'ok'). -spec(sync/2 :: (binary(), rabbit_types:vhost()) -> - 'ok' | rabbit_types:error('pending_acks' | 'not_mirrored' | - 'already_synced')). + 'ok' | rabbit_types:error('pending_acks' | 'not_mirrored')). -endif. diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 03a712d683..c9b6269b58 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -145,7 +145,7 @@ sync_mirrors(State = #state { name = QName, {shutdown, R, BQS1} -> {stop, R, S(BQS1)}; {sync_died, R, BQS1} -> Log("~p", [R]), {ok, S(BQS1)}; - {already_synced, BQS1} -> {{error, already_synced}, S(BQS1)}; + {already_synced, BQS1} -> {ok, S(BQS1)}; {ok, BQS1} -> Log("complete", []), {ok, S(BQS1)} end. |