summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2017-02-07 10:22:38 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2017-02-07 10:22:38 +0100
commitfbfb2b12d91b83bc009b73b274813f814a838833 (patch)
treedd756295941865382a19a2e053150c31062c98c2
parent3234c7a3ec78ee7717962d969dae619f83255ae4 (diff)
parent0d596be722460638331340d45ae7724a7f585200 (diff)
downloadrabbitmq-server-git-fbfb2b12d91b83bc009b73b274813f814a838833.tar.gz
Merge branch 'disable-background-gc-by-default' into stable
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 457bc45bbc..c2d6f68a21 100644
--- a/Makefile
+++ b/Makefile
@@ -90,11 +90,11 @@ 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, {2000, 500}},
+ {msg_store_credit_disc_bound, {3000, 800}},
{msg_store_io_batch_size, 2048},
%% see rabbitmq-server#143
%% and rabbitmq-server#949
- {credit_flow_default_credit, {200, 100}},
+ {credit_flow_default_credit, {400, 200}},
%% see rabbitmq-server#248
%% and rabbitmq-server#667
{channel_operation_timeout, 15000},
@@ -106,7 +106,7 @@ define PROJECT_ENV
%% rabbitmq-server-973
{queue_explicit_gc_run_operation_threshold, 1000},
{lazy_queue_explicit_gc_run_operation_threshold, 1000},
- {background_gc_enabled, true},
+ {background_gc_enabled, false},
{background_gc_target_interval, 60000}
]
endef