From 0b171a2b9cf1cb901b0f14d35177c06f093c3500 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Fri, 9 Feb 2024 19:10:08 -0500
Subject: [PATCH] bump default max_concurrent_requests to 500, update config
comment
also raise 1024 bytes to 4096 bytes in minimum max_request_size check
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
conduwuit-example.toml | 20 ++++++++++++++------
src/config/mod.rs | 2 +-
src/database/mod.rs | 4 ++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/conduwuit-example.toml b/conduwuit-example.toml
index 2381ddb15..a8a01609f 100644
--- a/conduwuit-example.toml
+++ b/conduwuit-example.toml
@@ -55,12 +55,20 @@ port = 6167
# likely need this to be 0.0.0.0.
address = "127.0.0.1"
-# How many requests conduwuit sends to other servers at the same time. Default is 100
-# Note that because conduwuit is very fast unlike other homeserver implementations,
-# setting this too high could inadvertently result in ratelimits kicking in, or
-# overloading lower-end homeservers out there. Recommended to leave this alone unless you
-# have a valid reason to. No this will not speed up room joins.
-#max_concurrent_requests = 100
+# How many requests conduwuit sends to other servers at the same time concurrently. Default is 500
+# Note that because conduwuit is very fast unlike other homeserver implementations, setting this too
+# high could inadvertently result in ratelimits kicking in, or overloading lower-end homeservers out there.
+#
+# A valid use-case for enabling this is if you have a significant amount of overall federation activity
+# such as many rooms joined/tracked, and many servers in the true destination cache caused by that. Upon
+# rebooting conduwuit, depending on how fast your resources are, client and incoming federation requests
+# may timeout or be "stalled" for a period of time due to hitting the max concurrent requests limit from
+# refreshing federation/destination caches and such.
+#
+# If you have a lot of active users on your homeserver, you will definitely need to raise this.
+#
+# No this will not speed up room joins.
+#max_concurrent_requests = 500
# Max request size for file uploads
max_request_size = 20_000_000 # in bytes
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 0bd6e96f2..184d16355 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -402,7 +402,7 @@ fn default_max_request_size() -> u32 {
}
fn default_max_concurrent_requests() -> u16 {
- 100
+ 500
}
fn default_max_fetch_prev_events() -> u16 {
diff --git a/src/database/mod.rs b/src/database/mod.rs
index e3026377d..818682dad 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -260,8 +260,8 @@ pub async fn load_or_create(config: Config) -> Result<()> {
return Err(Error::bad_config("Registration token is empty"));
}
- if config.max_request_size < 1024 {
- error!(?config.max_request_size, "Max request size is less than 1KB. Please increase it.");
+ if config.max_request_size < 4096 {
+ error!(?config.max_request_size, "Max request size is less than 4KB. Please increase it.");
}
let (presence_sender, presence_receiver) = mpsc::unbounded_channel();
--
GitLab