diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2012-05-28 16:58:39 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2012-05-28 16:58:39 +0100 |
commit | 592398bf0ef6368f719ecb2f2b69e2644e4aa277 (patch) | |
tree | 7fe48650bdbbd36c0aa26746c075cb9bc1f0aae7 | |
parent | 704dc052a57f6f0e81f3fa1cc346d924e7561640 (diff) | |
download | rabbitmq-server-592398bf0ef6368f719ecb2f2b69e2644e4aa277.tar.gz |
Backport 5735f418aa44 (Merge of bug24944; GM: 'DOWN' messages can overtake catchups)
-rw-r--r-- | src/gm.erl | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -698,9 +698,13 @@ terminate(Reason, State = #state { module = Module, code_change(_OldVsn, State, _Extra) -> {ok, State}. -prioritise_info(flush, _State) -> 1; -prioritise_info({'DOWN', _MRef, process, _Pid, _Reason}, _State) -> 1; -prioritise_info(_ , _State) -> 0. +prioritise_info(flush, _State) -> + 1; +prioritise_info({'DOWN', _MRef, process, _Pid, _Reason}, + #state { members_state = MS }) when MS /= undefined -> + 1; +prioritise_info(_, _State) -> + 0. handle_msg(check_neighbours, State) -> |