diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 06:17:23 -0700 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 06:17:23 -0700 |
| commit | 324c81b972ba2c742ef84391fb70bec6f2851cd7 (patch) | |
| tree | cf2ab83d291f2f05d5695785d6f6dc4555066c02 /src | |
| parent | 1fb0b1ed848092186022c83f94d549bdb0ccef4a (diff) | |
| parent | 47916838a759be87efe3acf2db910600f51603d8 (diff) | |
| download | rabbitmq-server-git-324c81b972ba2c742ef84391fb70bec6f2851cd7.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 3e6d961d5f..25555156d6 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1334,7 +1334,13 @@ handle_cast(policy_changed, State = #q{q = #amqqueue{name = Name}}) -> %% This also has the side effect of waking us up so we emit a %% stats event - so event consumers see the changed policy. {ok, Q} = rabbit_amqqueue:lookup(Name), - noreply(process_args_policy(State#q{q = Q})). + noreply(process_args_policy(State#q{q = Q})); + +handle_cast({sync_start, _, _}, State = #q{q = #amqqueue{name = Name}}) -> + %% Only a slave should receive this, it means we are a duplicated master + rabbit_mirror_queue_misc:log_warning( + Name, "Stopping after receiving sync_start from another master", []), + stop(State). handle_info({maybe_expire, Vsn}, State = #q{args_policy_version = Vsn}) -> case is_unused(State) of |