Merge pull request #2334 from rabbitmq/change-quorum-defaults

Changed default configuration values related to quorum queues

(cherry picked from commit 94d03ab)

Author: michaelklishin

Makefile

@@ -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

apps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl

@@ -105,9 +105,8 @@ set_default_config() ->
     Config = [
               {ra,
                [
-                %% Use a larger segments size for queues.
-                {segment_max_entries, 32768},
-                {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},

docs/rabbitmq.conf.example

@@ -456,7 +456,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
 
 ##

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().

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}
       ]}],
     []},