diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-20 17:41:13 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-20 17:41:13 +0300 |
| commit | 0b777c76bcf65c73328caa0726eafd98e6824c8e (patch) | |
| tree | 7a656cd2a6a2a9aa7d115bc047029ad8bcf3d2b0 | |
| parent | 78ac7fb591753c34c6c8cc87f31544a20d878af0 (diff) | |
| parent | c4d74f4294169d875bb734164c52d020f10f37c9 (diff) | |
| download | rabbitmq-server-git-0b777c76bcf65c73328caa0726eafd98e6824c8e.tar.gz | |
Merge branch 'master' into rabbitmq-server-msg-store-recovery-optimize
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/rabbit_access_control.erl | 17 | ||||
| -rw-r--r-- | test/msg_store_SUITE.erl | 4 |
3 files changed, 11 insertions, 14 deletions
@@ -89,8 +89,8 @@ define PROJECT_ENV %% setting has no effect because credit_flow is not used when %% writing to the queue index. See the setting %% queue_index_embed_msgs_below above. - {msg_store_credit_disc_bound, {3000, 800}}, - {msg_store_io_batch_size, 2048}, + {msg_store_credit_disc_bound, {4000, 800}}, + {msg_store_io_batch_size, 4096}, %% see rabbitmq-server#143, %% rabbitmq-server#949, rabbitmq-server#1098 {credit_flow_default_credit, {400, 200}}, diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 4dff2dbede..dedfe96823 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -178,17 +178,14 @@ check_access(Fun, Module, ErrStr, ErrArgs) -> check_access(Fun, Module, ErrStr, ErrArgs, access_refused). check_access(Fun, Module, ErrStr, ErrArgs, ErrName) -> - Allow = case Fun() of - {error, E} -> - rabbit_log:error(ErrStr ++ " by ~s: ~p~n", - ErrArgs ++ [Module, E]), - false; - Else -> - Else - end, - case Allow of + case Fun() of true -> ok; false -> - rabbit_misc:protocol_error(ErrName, ErrStr, ErrArgs) + rabbit_misc:protocol_error(ErrName, ErrStr, ErrArgs); + {error, E} -> + FullErrStr = ErrStr ++ ", backend ~s returned an error: ~p~n", + FullErrArgs = ErrArgs ++ [Module, E], + rabbit_log:error(FullErrStr, FullErrArgs), + rabbit_misc:protocol_error(ErrName, FullErrStr, FullErrArgs) end. diff --git a/test/msg_store_SUITE.erl b/test/msg_store_SUITE.erl index f63f6cb745..4eaa535a57 100644 --- a/test/msg_store_SUITE.erl +++ b/test/msg_store_SUITE.erl @@ -35,9 +35,9 @@ parameter_validation(_Config) -> %% IO_BATCH_SIZE must be greater than CREDIT_DISC_BOUND initial credit ok = ?T(validate_msg_store_io_batch_size_and_credit_disc_bound, - [{2000, 500}, 3000]), + [{4000, 800}, 5000]), {error, _} = ?T(validate_msg_store_io_batch_size_and_credit_disc_bound, - [{2000, 500}, 1500]), + [{4000, 800}, 1500]), %% All values must be integers {error, _} = ?T(validate_msg_store_io_batch_size_and_credit_disc_bound, |