summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2016-09-12 17:42:27 +0400
committerGitHub <noreply@github.com>2016-09-12 17:42:27 +0400
commit6bc3b2db51b01e7ce4b09e5fda02a1669de16bb0 (patch)
treed32fb536c2c2e9abc595a02eb2ccc2a033f053a8
parentdc8a921682342e2b44a3dd59a76b08643ff3c0b5 (diff)
parent60c2a6163fe1fbc360763f24c1456261fa7d22c2 (diff)
downloadrabbitmq-server-git-6bc3b2db51b01e7ce4b09e5fda02a1669de16bb0.tar.gz
Merge pull request #951 from rabbitmq/rabbitmq-server-950
Handle not found outside of verify
-rw-r--r--src/gm.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gm.erl b/src/gm.erl
index 008a29151e..c6d73b6cdd 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -1137,7 +1137,7 @@ record_dead_member_in_group(Self, Member, GroupName, TxnFun, Verify) ->
true ->
check_membership(Self, read_group(GroupName));
false ->
- read_group(GroupName)
+ check_group(read_group(GroupName))
end,
case lists:splitwith(
fun (Member1) -> Member1 =/= Member end, Members) of
@@ -1615,3 +1615,8 @@ check_membership(GroupName) ->
{error, not_found} ->
throw(lost_membership)
end.
+
+check_group({error, not_found}) ->
+ throw(lost_membership);
+check_group(Any) ->
+ Any.