diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2016-09-12 15:18:32 +0100 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2016-09-12 15:18:32 +0100 |
| commit | 90dcd68cf2c871abf999851605451ebf0e3dfaf6 (patch) | |
| tree | c813a9ac57df585c083b3c06388801994c2b5f14 /src | |
| parent | f887ff1a4b403a17040627fea1aa901ef23dbe30 (diff) | |
| parent | 41f2d6d49d6456a22cb80a9e0866fe71e551d55e (diff) | |
| download | rabbitmq-server-git-90dcd68cf2c871abf999851605451ebf0e3dfaf6.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/gm.erl | 7 | ||||
| -rw-r--r-- | src/rabbit.app.src | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/gm.erl b/src/gm.erl index 0b5c1c44c4..aef23c7269 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. diff --git a/src/rabbit.app.src b/src/rabbit.app.src index 738a38e2bb..2e17bbbc3c 100644 --- a/src/rabbit.app.src +++ b/src/rabbit.app.src @@ -98,7 +98,8 @@ {msg_store_credit_disc_bound, {2000, 500}}, {msg_store_io_batch_size, 2048}, %% see rabbitmq-server#143 - {credit_flow_default_credit, {200, 50}}, + %% and rabbitmq-server#949 + {credit_flow_default_credit, {200, 100}}, %% see rabbitmq-server#248 %% and rabbitmq-server#667 {channel_operation_timeout, 15000} |