magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve db pool topology configuration

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-01-06 01:30:22 +00:00
parent d36167ab64
commit 94c8683836
4 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/database/pool/configure.rs
View file

@ -1,14 +1,13 @@
use std::{path::PathBuf, sync::Arc};
use conduwuit::{
debug, debug_info, expected,
debug, debug_info, expected, is_equal_to,
utils::{
math::usize_from_f64,
result::LogDebugErr,
stream,
stream::{AMPLIFICATION_LIMIT, WIDTH_LIMIT},
sys::{compute::is_core_available, storage},
BoolExt,
},
Server,
};
@ -19,39 +18,32 @@ pub(super) fn configure(server: &Arc<Server>) -> (usize, Vec<usize>, Vec<usize>)
let config = &server.config;
// This finds the block device and gathers all the properties we need.
let (device_name, device_prop) = config
.db_pool_affinity
.and_then(|| {
let path: PathBuf = config.database_path.clone();
let name = storage::name_from_path(&path).log_debug_err().ok();
let prop = storage::parallelism(&path);
name.map(|name| (name, prop))
})
.unzip();
let path: PathBuf = config.database_path.clone();
let device_name = storage::name_from_path(&path).log_debug_err().ok();
let device_prop = storage::parallelism(&path);
// The default worker count is masked-on if we didn't find better information.
let default_worker_count = device_prop
.as_ref()
.is_none_or(|prop| prop.mq.is_empty())
.then_some(config.db_pool_workers);
let default_worker_count = device_prop.mq.is_empty().then_some(config.db_pool_workers);
// Determine the worker groupings. Each indice represents a hardware queue and
// contains the number of workers which will service it.
let worker_counts: Vec<_> = device_prop
.mq
.iter()
.map(|dev| &dev.mq)
.flat_map(|mq| mq.iter())
.filter(|mq| mq.cpu_list.iter().copied().any(is_core_available))
.map(|mq| {
mq.nr_tags.unwrap_or_default().min(
config.db_pool_workers_limit.saturating_mul(
mq.cpu_list
.iter()
.filter(|&&id| is_core_available(id))
.count()
.max(1),
),
)
let shares = mq
.cpu_list
.iter()
.filter(|&&id| is_core_available(id))
.count()
.max(1);
let limit = config.db_pool_workers_limit.saturating_mul(shares);
let limit = device_prop.nr_requests.map_or(limit, |nr| nr.min(limit));
mq.nr_tags.unwrap_or(WORKER_LIMIT.0).min(limit)
})
.chain(default_worker_count)
.collect();
@ -72,9 +64,8 @@ pub(super) fn configure(server: &Arc<Server>) -> (usize, Vec<usize>, Vec<usize>)
// going on because cpu's which are not available to the process are filtered
// out, similar to the worker_counts.
let topology = device_prop
.mq
.iter()
.map(|dev| &dev.mq)
.flat_map(|mq| mq.iter())
.fold(vec![0; 128], |mut topology, mq| {
mq.cpu_list
.iter()
@ -89,9 +80,12 @@ pub(super) fn configure(server: &Arc<Server>) -> (usize, Vec<usize>, Vec<usize>)
// Regardless of the capacity of all queues we establish some limit on the total
// number of workers; this is hopefully hinted by nr_requests.
let max_workers = device_prop
.as_ref()
.and_then(|prop| prop.nr_requests)
.unwrap_or(WORKER_LIMIT.1);
.mq
.iter()
.filter_map(|mq| mq.nr_tags)
.chain(default_worker_count)
.fold(0_usize, usize::saturating_add)
.clamp(WORKER_LIMIT.0, WORKER_LIMIT.1);
// Determine the final worker count which we'll be spawning.
let total_workers = worker_counts
@ -102,7 +96,7 @@ pub(super) fn configure(server: &Arc<Server>) -> (usize, Vec<usize>, Vec<usize>)
// After computing all of the above we can update the global automatic stream
// width, hopefully with a better value tailored to this system.
if config.stream_width_scale > 0.0 {
let num_queues = queue_sizes.len();
let num_queues = queue_sizes.len().max(1);
update_stream_width(server, num_queues, total_workers);
}
@ -117,6 +111,13 @@ pub(super) fn configure(server: &Arc<Server>) -> (usize, Vec<usize>, Vec<usize>)
"Frontend topology",
);
assert!(total_workers > 0, "some workers expected");
assert!(!queue_sizes.is_empty(), "some queues expected");
assert!(
!queue_sizes.iter().copied().any(is_equal_to!(0)),
"positive queue sizes expected"
);
(total_workers, queue_sizes, topology)
}