diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:45:20 +0300 |
| commit | 4837af6cd04ccb87b5e2399495eff468fa99c1a3 (patch) | |
| tree | 6ce7d0f7fb9dedd25a400d5a016f1ccb3b0d36ac /src/gm.erl | |
| parent | 008c4eb7f0a9b14838439db934eb98dbe7801dbb (diff) | |
| parent | 5c6d8e523349bb7df418cfff52b99f173a7cc4c1 (diff) | |
| download | rabbitmq-server-git-4837af6cd04ccb87b5e2399495eff468fa99c1a3.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'src/gm.erl')
| -rw-r--r-- | src/gm.erl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/gm.erl b/src/gm.erl index aa4ffcf511..3a1459fea4 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -1175,11 +1175,20 @@ record_new_member_in_group(NewMember, Left, GroupName, TxnFun) -> try Group = #gm_group { members = Members, version = Ver } = check_membership(Left, read_group(GroupName)), - {Prefix, [Left | Suffix]} = - lists:splitwith(fun (M) -> M =/= Left end, Members), - write_group(Group #gm_group { - members = Prefix ++ [Left, NewMember | Suffix], - version = Ver + 1 }) + case lists:member(NewMember, Members) of + true -> + %% This avois duplicates during partial partitions, + %% as inconsistent views might happen during them + rabbit_log:warning("(~p) GM avoiding duplicate of ~p", + [self(), NewMember]), + Group; + false -> + {Prefix, [Left | Suffix]} = + lists:splitwith(fun (M) -> M =/= Left end, Members), + write_group(Group #gm_group { + members = Prefix ++ [Left, NewMember | Suffix], + version = Ver + 1 }) + end catch lost_membership -> %% The transaction must not be abruptly crashed, but |