summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-10-26 16:12:15 +0300
committerGitHub <noreply@github.com>2016-10-26 16:12:15 +0300
commitd36b6391d04de5120418368e621dc12f97cc4012 (patch)
tree002fc27e81099f573a53f809b559c921ade753ca
parent3906b1bfd21c83ba33ef5de491a993f8d4d9fc03 (diff)
parent1dd5afb1fc18ee607ea7b2d9eda0a62c6f6865d6 (diff)
downloadrabbitmq-server-git-d36b6391d04de5120418368e621dc12f97cc4012.tar.gz
Merge pull request #1010 from rabbitmq/rabbitmq-server-1007
Ignore policy_changed on slaves
-rw-r--r--src/rabbit_mirror_queue_slave.erl7
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}) ->