diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 16:13:14 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 16:13:14 +0300 |
| commit | 79b2ecb53fbfed394485a86a7f27308897c825c3 (patch) | |
| tree | 8666ae57582e65eed203518f831f4521c68eb0d6 /src | |
| parent | 03725d2d1c3b225510d5e7e780656a0fbe2b7ba1 (diff) | |
| parent | d36b6391d04de5120418368e621dc12f97cc4012 (diff) | |
| download | rabbitmq-server-git-79b2ecb53fbfed394485a86a7f27308897c825c3.tar.gz | |
Merge branch 'stable' into rabbitmq-server-972
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 4770018f9e..6017e5a028 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -314,7 +314,12 @@ handle_cast({set_ram_duration_target, Duration}, State = #state { backing_queue = BQ, backing_queue_state = BQS }) -> BQS1 = BQ:set_ram_duration_target(Duration, BQS), - noreply(State #state { backing_queue_state = BQS1 }). + noreply(State #state { backing_queue_state = BQS1 }); + +handle_cast(policy_changed, State) -> + %% During partial partitions, we might end up receiving messages expected by a master + %% Ignore them + noreply(State). handle_info(update_ram_duration, State = #state{backing_queue = BQ, backing_queue_state = BQS}) -> |