diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 18:06:52 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-10-26 18:06:52 +0300 |
| commit | a94a002c27a6a3c7e66f967acabbf7cbfbe7c7ff (patch) | |
| tree | 1cdcd0b51b4113f19845f9d3c5d2ba39071633b0 /src/gm.erl | |
| parent | 324c81b972ba2c742ef84391fb70bec6f2851cd7 (diff) | |
| parent | e0866b7c2ecb50c13bd137eb3d5600816f9ad96d (diff) | |
| download | rabbitmq-server-git-a94a002c27a6a3c7e66f967acabbf7cbfbe7c7ff.tar.gz | |
Merge branch 'stable'
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 |