diff options
| author | Vanlightly <vanlightly@gmail.com> | 2020-05-01 03:43:42 -0700 |
|---|---|---|
| committer | Vanlightly <vanlightly@gmail.com> | 2020-05-01 03:43:42 -0700 |
| commit | 552c412dbc4445f916403e5dd9735fe02b5f82f3 (patch) | |
| tree | adc5c743b0b6c9bb8e3c5b72e27ace86b92c8b8b | |
| parent | cb99072d7e9f6ffa5bbfe0be78a1cf5c587942a3 (diff) | |
| download | rabbitmq-server-git-552c412dbc4445f916403e5dd9735fe02b5f82f3.tar.gz | |
Changed or overridden default configuration values related to quorum queues
Specifically:
- changed default quorum_commands_soft_limit from 256 to 32
- override Ra wal_max_batch_size to 4096
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl | 3 | ||||
| -rw-r--r-- | docs/rabbitmq.conf.example | 2 | ||||
| -rw-r--r-- | src/rabbit_fifo_client.erl | 2 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 4 |
5 files changed, 7 insertions, 6 deletions
@@ -97,7 +97,7 @@ define PROJECT_ENV %% see rabbitmq-server#143, %% rabbitmq-server#949, rabbitmq-server#1098 {credit_flow_default_credit, {400, 200}}, - {quorum_commands_soft_limit, 256}, + {quorum_commands_soft_limit, 32}, {quorum_cluster_size, 5}, %% see rabbitmq-server#248 %% and rabbitmq-server#667 diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl index ece600b68e..5716919c85 100644 --- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -86,7 +86,8 @@ set_default_config() -> Config = [ {ra, [ - {wal_max_size_bytes, 536870912} %% 5 * 2 ^ 20 + {wal_max_size_bytes, 536870912}, %% 5 * 2 ^ 20 + {wal_max_batch_size, 4096} ]}, {sysmon_handler, [{process_limit, 100}, diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example index 40a461cc7d..53611abbcc 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -453,7 +453,7 @@ ## # raft.segment_max_entries = 65536 # raft.wal_max_size_bytes = 1048576 -# raft.wal_max_batch_size = 32768 +# raft.wal_max_batch_size = 4096 # raft.snapshot_chunk_size = 1000000 ## diff --git a/src/rabbit_fifo_client.erl b/src/rabbit_fifo_client.erl index 918714bbf9..bfaa1b3ce4 100644 --- a/src/rabbit_fifo_client.erl +++ b/src/rabbit_fifo_client.erl @@ -46,7 +46,7 @@ -include_lib("rabbit_common/include/rabbit.hrl"). --define(SOFT_LIMIT, 256). +-define(SOFT_LIMIT, 32). -define(TIMER_TIME, 10000). -type seq() :: non_neg_integer(). diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 82864f8eda..fcf0851b52 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -682,9 +682,9 @@ credential_validator.regexp = ^abc\\d+", []}, {raft_wal_max_batch_size, - "raft.wal_max_batch_size = 32768", + "raft.wal_max_batch_size = 4096", [{ra, [ - {wal_max_batch_size, 32768} + {wal_max_batch_size, 4096} ]}], []}, |