Compare commits

..

No commits in common. "f5655ea0d5646205c0b2961c2b367a7bba9dc7f0" and "b66154b05d925ddbc170a6d288f731461e36404a" have entirely different histories.

2 changed files with 13 additions and 12 deletions

View file

@ -1155,7 +1155,7 @@ pub struct Config {
/// 3 to 5 = Statistics with possible performance impact. /// 3 to 5 = Statistics with possible performance impact.
/// 6 = All statistics. /// 6 = All statistics.
/// ///
/// default: 3 /// default: 1
#[serde(default = "default_rocksdb_stats_level")] #[serde(default = "default_rocksdb_stats_level")]
pub rocksdb_stats_level: u8, pub rocksdb_stats_level: u8,
@ -2199,7 +2199,7 @@ fn default_typing_client_timeout_max_s() -> u64 { 45 }
fn default_rocksdb_recovery_mode() -> u8 { 1 } fn default_rocksdb_recovery_mode() -> u8 { 1 }
fn default_rocksdb_log_level() -> String { "info".to_owned() } fn default_rocksdb_log_level() -> String { "error".to_owned() }
fn default_rocksdb_log_time_to_roll() -> usize { 0 } fn default_rocksdb_log_time_to_roll() -> usize { 0 }
@ -2231,7 +2231,7 @@ fn default_rocksdb_compression_level() -> i32 { 32767 }
#[allow(clippy::doc_markdown)] #[allow(clippy::doc_markdown)]
fn default_rocksdb_bottommost_compression_level() -> i32 { 32767 } fn default_rocksdb_bottommost_compression_level() -> i32 { 32767 }
fn default_rocksdb_stats_level() -> u8 { 3 } fn default_rocksdb_stats_level() -> u8 { 1 }
// I know, it's a great name // I know, it's a great name
#[must_use] #[must_use]
@ -2286,13 +2286,14 @@ fn default_admin_log_capture() -> String {
fn default_admin_room_tag() -> String { "m.server_notice".to_owned() } fn default_admin_room_tag() -> String { "m.server_notice".to_owned() }
#[allow(clippy::as_conversions, clippy::cast_precision_loss)] #[allow(clippy::as_conversions, clippy::cast_precision_loss)]
pub fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) } fn parallelism_scaled_f64(val: f64) -> f64 { val * (sys::available_parallelism() as f64) }
pub fn parallelism_scaled_u32(val: u32) -> u32 { val.saturating_mul(sys::available_parallelism() as u32) } fn parallelism_scaled_u32(val: u32) -> u32 {
let val = val.try_into().expect("failed to cast u32 to usize");
parallelism_scaled(val).try_into().unwrap_or(u32::MAX)
}
pub fn parallelism_scaled_i32(val: i32) -> i32 { val.saturating_mul(sys::available_parallelism() as i32) } fn parallelism_scaled(val: usize) -> usize { val.saturating_mul(sys::available_parallelism()) }
pub fn parallelism_scaled(val: usize) -> usize { val.saturating_mul(sys::available_parallelism()) }
fn default_trusted_server_batch_size() -> usize { 256 } fn default_trusted_server_batch_size() -> usize { 256 }

View file

@ -2,7 +2,7 @@ use std::{cmp, convert::TryFrom};
use conduwuit::{Config, Result, utils}; use conduwuit::{Config, Result, utils};
use rocksdb::{Cache, DBRecoveryMode, Env, LogLevel, Options, statistics::StatsLevel}; use rocksdb::{Cache, DBRecoveryMode, Env, LogLevel, Options, statistics::StatsLevel};
use conduwuit::config::{parallelism_scaled_i32, parallelism_scaled_u32};
use super::{cf_opts::cache_size_f64, logger::handle as handle_log}; use super::{cf_opts::cache_size_f64, logger::handle as handle_log};
/// Create database-wide options suitable for opening the database. This also /// Create database-wide options suitable for opening the database. This also
@ -23,8 +23,8 @@ pub(crate) fn db_options(config: &Config, env: &Env, row_cache: &Cache) -> Resul
set_logging_defaults(&mut opts, config); set_logging_defaults(&mut opts, config);
// Processing // Processing
opts.set_max_background_jobs(parallelism_scaled_i32(1)); opts.set_max_background_jobs(num_threads::<i32>(config)?);
opts.set_max_subcompactions(parallelism_scaled_u32(1)); opts.set_max_subcompactions(num_threads::<u32>(config)?);
opts.set_avoid_unnecessary_blocking_io(true); opts.set_avoid_unnecessary_blocking_io(true);
opts.set_max_file_opening_threads(0); opts.set_max_file_opening_threads(0);
@ -128,7 +128,7 @@ fn set_logging_defaults(opts: &mut Options, config: &Config) {
} }
fn num_threads<T: TryFrom<usize>>(config: &Config) -> Result<T> { fn num_threads<T: TryFrom<usize>>(config: &Config) -> Result<T> {
const MIN_PARALLELISM: usize = 4; const MIN_PARALLELISM: usize = 2;
let requested = if config.rocksdb_parallelism_threads != 0 { let requested = if config.rocksdb_parallelism_threads != 0 {
config.rocksdb_parallelism_threads config.rocksdb_parallelism_threads