diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 16:12:43 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 16:12:43 +0300 |
| commit | 1fb0b1ed848092186022c83f94d549bdb0ccef4a (patch) | |
| tree | c9aaa03a64a03e7021afbc2fb2603e2c73cde1e5 | |
| parent | 3ad0b674caaa7a898f525933590acfd4f0d99d3c (diff) | |
| parent | d36b6391d04de5120418368e621dc12f97cc4012 (diff) | |
| download | rabbitmq-server-git-1fb0b1ed848092186022c83f94d549bdb0ccef4a.tar.gz | |
Merge branch 'stable'
| -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 29ba21d374..61623c9441 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -336,7 +336,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}) -> |