diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-10-26 18:06:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 18:06:30 +0300 |
| commit | e0866b7c2ecb50c13bd137eb3d5600816f9ad96d (patch) | |
| tree | 277162a72e82f82b2997b201e1bb63f965ba65da /src | |
| parent | 47916838a759be87efe3acf2db910600f51603d8 (diff) | |
| parent | 79b2ecb53fbfed394485a86a7f27308897c825c3 (diff) | |
| download | rabbitmq-server-git-e0866b7c2ecb50c13bd137eb3d5600816f9ad96d.tar.gz | |
Merge pull request #1011 from rabbitmq/rabbitmq-server-972
Avoid duplicates in members list during partial partition
Diffstat (limited to 'src')
| -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 74e19ee6fd..41aa01f04d 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 |