From caf9834e50b540fc48bf8cf50dc439c57c503de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Tue, 1 Feb 2022 14:42:13 +0100
Subject: [PATCH] feat: cache capacity modifier
---
src/database.rs | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/database.rs b/src/database.rs
index 79b820884..449d71bd1 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -49,6 +49,8 @@ pub struct Config {
database_path: String,
#[serde(default = "default_db_cache_capacity_mb")]
db_cache_capacity_mb: f64,
+ #[serde(default = "default_conduit_cache_capacity_modifier")]
+ conduit_cache_capacity_modifier: f64,
#[serde(default = "default_rocksdb_max_open_files")]
rocksdb_max_open_files: i32,
#[serde(default = "default_pdu_cache_capacity")]
@@ -129,6 +131,10 @@ fn default_db_cache_capacity_mb() -> f64 {
10.0
}
+fn default_conduit_cache_capacity_modifier() -> f64 {
+ 1.0
+}
+
fn default_rocksdb_max_open_files() -> i32 {
20
}
@@ -361,15 +367,15 @@ pub async fn load_or_create(config: &Config) -> Result<Arc<TokioRwLock<Self>>> {
.try_into()
.expect("pdu cache capacity fits into usize"),
)),
- auth_chain_cache: Mutex::new(LruCache::new(100_000)),
- shorteventid_cache: Mutex::new(LruCache::new(100_000)),
- eventidshort_cache: Mutex::new(LruCache::new(100_000)),
- shortstatekey_cache: Mutex::new(LruCache::new(100_000)),
- statekeyshort_cache: Mutex::new(LruCache::new(100_000)),
+ auth_chain_cache: Mutex::new(LruCache::new((100_000.0 * config.conduit_cache_capacity_modifier) as usize)),
+ shorteventid_cache: Mutex::new(LruCache::new((100_000.0 * config.conduit_cache_capacity_modifier) as usize)),
+ eventidshort_cache: Mutex::new(LruCache::new((100_000.0 * config.conduit_cache_capacity_modifier) as usize)),
+ shortstatekey_cache: Mutex::new(LruCache::new((100_000.0 * config.conduit_cache_capacity_modifier) as usize)),
+ statekeyshort_cache: Mutex::new(LruCache::new((100_000.0 * config.conduit_cache_capacity_modifier) as usize)),
our_real_users_cache: RwLock::new(HashMap::new()),
appservice_in_room_cache: RwLock::new(HashMap::new()),
lazy_load_waiting: Mutex::new(HashMap::new()),
- stateinfo_cache: Mutex::new(LruCache::new(100)),
+ stateinfo_cache: Mutex::new(LruCache::new((100.0 * config.conduit_cache_capacity_modifier) as usize)),
},
account_data: account_data::AccountData {
roomuserdataid_accountdata: builder.open_tree("roomuserdataid_accountdata")?,
--
GitLab