diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-20 15:27:28 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-20 15:27:28 +0300 |
| commit | 34d25d5f658dbccf721e4ec11b6b80cee9eaa604 (patch) | |
| tree | b075b09eaad17b68884e80cf659a17efe6bd64db | |
| parent | 38bf6ec721f7d71e6e0477e029cde510bda85378 (diff) | |
| parent | 09b078a15e982d9a1163fb697bbee2b7fb9a054e (diff) | |
| download | rabbitmq-server-git-34d25d5f658dbccf721e4ec11b6b80cee9eaa604.tar.gz | |
Merge branch 'master' into rabbitmq-auth-backend-uaa-3
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/snippets.config | 28 | ||||
| -rw-r--r-- | test/msg_store_SUITE.erl | 4 |
3 files changed, 31 insertions, 5 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/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config index 9fb0b7519b..150ccfac5c 100644 --- a/test/config_schema_SUITE_data/snippets.config +++ b/test/config_schema_SUITE_data/snippets.config @@ -897,6 +897,32 @@ auth_cache.cached_backend = ldap", "proxy_protocol = false", [{rabbit, [ {proxy_protocol, false} -]}],[]} +]}],[]}, +{trust_store, + "trust_store.refresh_interval = 30", + [{rabbitmq_trust_store, [{refresh_interval, 30}]}], + [rabbitmq_trust_store]}, +{trust_store_file, + "trust_store.directory = /tmp/foo/bar", + [{rabbitmq_trust_store, [{directory, "/tmp/foo/bar"}]}], + [rabbitmq_trust_store]}, +{trust_store_providers, + "trust_store.providers.1 = file + trust_store.providers.2 = http + trust_store.providers.3 = rabbit_trust_store_opera_com_provider", + [{rabbitmq_trust_store, [{providers, [rabbit_trust_store_file_provider, + rabbit_trust_store_http_provider, + rabbit_trust_store_opera_com_provider]}]}], + [rabbitmq_trust_store]}, +{trust_store_http, + "trust_store.providers.1 = http + trust_store.url = http://example.com + trust_store.ssl_options.certfile = test/config_schema_SUITE_data/certs/cert.pem + trust_store.ssl_options.password = i_am_password", + [{rabbitmq_trust_store, [{providers, [rabbit_trust_store_http_provider]}, + {url, "http://example.com"}, + {ssl_options, [{certfile, "test/config_schema_SUITE_data/certs/cert.pem"}, + {password, "i_am_password"}]}]}], + [rabbitmq_trust_store]} ]. 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, |