diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-11-29 13:09:15 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-11-29 13:09:15 +0000 |
| commit | d15c17e58e21d831aa7619d726ef4c77296460cc (patch) | |
| tree | 49b03a6267ef4b85834583553daea5f3e1160d58 | |
| parent | 8a5c69c0254bf7360b53721e501a80799ca72e04 (diff) | |
| download | rabbitmq-server-git-d15c17e58e21d831aa7619d726ef4c77296460cc.tar.gz | |
Don't do anything if we decided not to do anything.
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_sync.erl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index b12f85b89a..53564f09c1 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -239,6 +239,7 @@ handle_cast({sync_start, Ref, Syncer}, self(), update_ram_duration), {TRefN, BQSN1} end) of + denied -> noreply(State1); {ok, Res} -> noreply(set_delta(0, S(Res))); %% [0] {failed, Res} -> noreply(S(Res)); {stop, Reason, Res} -> {stop, Reason, S(Res)} diff --git a/src/rabbit_mirror_queue_sync.erl b/src/rabbit_mirror_queue_sync.erl index b717f1f74f..266465ec39 100644 --- a/src/rabbit_mirror_queue_sync.erl +++ b/src/rabbit_mirror_queue_sync.erl @@ -166,7 +166,7 @@ sync_send_complete(SPid, _MRef, Ref) -> slave(0, Ref, TRef, Syncer, _BQ, BQS, _UpdateRamDuration) -> Syncer ! {sync_deny, Ref, self()}, - {ok, {TRef, BQS}}; + denied; slave(_DD, Ref, TRef, Syncer, BQ, BQS, UpdateRamDuration) -> MRef = erlang:monitor(process, Syncer), |