slingshot: configurable cache sizes (#3 round 2) #11

+5 -3

slingshot/src/firehose_cache.rs

··· 4 4 5 5 pub async fn firehose_cache( 6 6 cache_dir: impl AsRef<Path>, 7 7 + memory_mb: usize, 8 8 + disk_gb: usize, 7 9 ) -> Result<HybridCache<String, CachedRecord>, String> { 8 10 let cache = HybridCacheBuilder::new() 9 11 .with_name("firehose") 10 10 - .memory(64 * 2_usize.pow(20)) 12 12 + .memory(memory_mb * 2_usize.pow(20)) 11 13 .with_weighter(|k: &String, v| k.len() + std::mem::size_of_val(v)) 12 14 .storage(Engine::large()) 13 15 .with_device_options( 14 16 DirectFsDeviceOptions::new(cache_dir) 15 15 - .with_capacity(2_usize.pow(30)) // TODO: configurable (1GB to have something) 16 16 - .with_file_size(16 * 2_usize.pow(20)), // note: this does limit the max cached item size, warning jumbo records 17 17 + .with_capacity(disk_gb * 2_usize.pow(30)) 18 18 + .with_file_size(16 * 2_usize.pow(20)), // note: this does limit the max cached item size (records should be max 1mb cbor, bit bigger json) 17 19 ) 18 20 .build() 19 21 .await

+8 -4

slingshot/src/identity.rs

··· 161 161 } 162 162 163 163 impl Identity { 164 164 - pub async fn new(cache_dir: impl AsRef<Path>) -> Result<Self, IdentityError> { 164 164 + pub async fn new( 165 165 + cache_dir: impl AsRef<Path>, 166 166 + memory_mb: usize, 167 167 + disk_gb: usize, 168 168 + ) -> Result<Self, IdentityError> { 165 169 let http_client = Arc::new(DefaultHttpClient::default()); 166 170 let handle_resolver = AtprotoHandleResolver::new(AtprotoHandleResolverConfig { 167 171 dns_txt_resolver: HickoryDnsTxtResolver::new().unwrap(), ··· 174 178 175 179 let cache = HybridCacheBuilder::new() 176 180 .with_name("identity") 177 177 - .memory(16 * 2_usize.pow(20)) 181 181 + .memory(memory_mb * 2_usize.pow(20)) 178 182 .with_weighter(|k, v| std::mem::size_of_val(k) + std::mem::size_of_val(v)) 179 183 .storage(Engine::small()) 180 184 .with_device_options( 181 185 DirectFsDeviceOptions::new(cache_dir) 182 182 - .with_capacity(2_usize.pow(30)) // TODO: configurable (1GB to have something) 183 183 - .with_file_size(2_usize.pow(20)), // note: this does limit the max cached item size, warning jumbo records 186 186 + .with_capacity(disk_gb * 2_usize.pow(30)) // TODO: configurable (1GB to have something) 187 187 + .with_file_size(2_usize.pow(20)), // note: this does limit the max cached item size! 184 188 ) 185 189 .build() 186 190 .await?;

+30 -4

slingshot/src/main.rs

··· 31 31 #[arg(long, env = "SLINGSHOT_BIND")] 32 32 #[clap(default_value = "0.0.0.0:8080")] 33 33 bind: std::net::SocketAddr, 34 34 + /// memory cache size in megabytes for records 35 35 + #[arg(long, env = "SLINGSHOT_RECORD_CACHE_MEMORY_MB")] 36 36 + #[clap(default_value_t = 64)] 37 37 + record_cache_memory_mb: usize, 38 38 + /// disk cache size in gigabytes for records 39 39 + #[arg(long, env = "SLINGSHOT_RECORD_CACHE_DISK_DB")] 40 40 + #[clap(default_value_t = 1)] 41 41 + record_cache_disk_gb: usize, 42 42 + /// memory cache size in megabytes for identities 43 43 + #[arg(long, env = "SLINGSHOT_IDENTITY_CACHE_MEMORY_MB")] 44 44 + #[clap(default_value_t = 64)] 45 45 + identity_cache_memory_mb: usize, 46 46 + /// disk cache size in gigabytes for identities 47 47 + #[arg(long, env = "SLINGSHOT_IDENTITY_CACHE_DISK_DB")] 48 48 + #[clap(default_value_t = 1)] 49 49 + identity_cache_disk_gb: usize, 34 50 /// the domain pointing to this server 35 51 /// 36 52 /// if present: ··· 108 124 log::info!("cache dir ready at at {cache_dir:?}."); 109 125 110 126 log::info!("setting up firehose cache..."); 111 111 - let cache = firehose_cache(cache_dir.join("./firehose")).await?; 127 127 + let cache = firehose_cache( 128 128 + cache_dir.join("./firehose"), 129 129 + args.record_cache_memory_mb, 130 130 + args.record_cache_disk_gb, 131 131 + ) 132 132 + .await?; 112 133 log::info!("firehose cache ready."); 113 134 114 135 let mut tasks: tokio::task::JoinSet<Result<(), MainTaskError>> = tokio::task::JoinSet::new(); 115 136 116 137 log::info!("starting identity service..."); 117 117 - let identity = Identity::new(cache_dir.join("./identity")) 118 118 - .await 119 119 - .map_err(|e| format!("identity setup failed: {e:?}"))?; 138 138 + let identity = Identity::new( 139 139 + cache_dir.join("./identity"), 140 140 + args.identity_cache_memory_mb, 141 141 + args.identity_cache_disk_gb, 142 142 + ) 143 143 + .await 144 144 + .map_err(|e| format!("identity setup failed: {e:?}"))?; 145 145 + 120 146 log::info!("identity service ready."); 121 147 let identity_refresher = identity.clone(); 122 148 let identity_shutdown = shutdown.clone();