diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2017-10-29 12:18:23 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-29 12:18:23 +0400 |
| commit | 2aeee9eab4c753083549f65bcad3065b350f3ac9 (patch) | |
| tree | 882e299e70c308d1038bbf97250a526934259fd3 | |
| parent | Omit "ProtectSystem" option from systemd unit (diff) | |
| parent | mod_stream_mgmt: Increase 'max_ack_queue' default (diff) | |
Merge pull request #2028 from weiss/increase-queue-sizes
Increase max_fsm_queue and max_ack_queue sizes
| -rw-r--r-- | ejabberd.yml.example | 2 | ||||
| -rw-r--r-- | src/ejabberd_redis.erl | 2 | ||||
| -rw-r--r-- | src/mod_stream_mgmt.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ejabberd.yml.example b/ejabberd.yml.example index 0df20d626..fd8b745e6 100644 --- a/ejabberd.yml.example +++ b/ejabberd.yml.example @@ -444,7 +444,7 @@ shaper: ## This option specifies the maximum number of elements in the queue ## of the FSM. Refer to the documentation for details. ## -max_fsm_queue: 1000 +max_fsm_queue: 10000 ###. ==================== ###' ACCESS CONTROL LISTS diff --git a/src/ejabberd_redis.erl b/src/ejabberd_redis.erl index 56948ec83..76ae10ace 100644 --- a/src/ejabberd_redis.erl +++ b/src/ejabberd_redis.erl @@ -45,7 +45,7 @@ -define(SERVER, ?MODULE). -define(PROCNAME, 'ejabberd_redis_client'). -define(TR_STACK, redis_transaction_stack). --define(DEFAULT_MAX_QUEUE, 5000). +-define(DEFAULT_MAX_QUEUE, 10000). -define(MAX_RETRIES, 1). -define(CALL_TIMEOUT, 60*1000). %% 60 seconds diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl index 2f6b0fc71..2bf151a04 100644 --- a/src/mod_stream_mgmt.erl +++ b/src/mod_stream_mgmt.erl @@ -709,7 +709,7 @@ bounce_message_queue() -> %%%=================================================================== get_max_ack_queue(Host, Opts) -> gen_mod:get_module_opt(Host, ?MODULE, max_ack_queue, - gen_mod:get_opt(max_ack_queue, Opts, 1000)). + gen_mod:get_opt(max_ack_queue, Opts, 5000)). get_resume_timeout(Host, Opts) -> gen_mod:get_module_opt(Host, ?MODULE, resume_timeout, |