gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-11 07:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(obs): isolate process sampler windows (#4492)

Browse Source 
* fix(obs): isolate process sampler windows

Refs rustfs/backlog#1004
Refs rustfs/backlog#986

- add a reusable ProcessSampler so callers can own independent sysinfo refresh windows
- wire separate sampler instances for obs metrics scheduling and memory observability
- keep compatibility helpers while avoiding cross-task CPU and disk delta interference

Co-Authored-By: heihutu <heihutu@gmail.com>

* fix(obs): import process sampler bundle helper

Refs rustfs/backlog#1004
Refs rustfs/backlog#986

- import collect_process_metric_bundle_with in the metrics scheduler
- drop the stale collect_process_metric_bundle import after switching scheduler sampling to independent process samplers

Co-Authored-By: heihutu <heihutu@gmail.com>

* fix(obs): move process sampler into blocking task

Refs rustfs/backlog#1004
Refs rustfs/backlog#986

- move the memory observability process sampler into the spawn_blocking closure
- satisfy the closure static lifetime required by tokio while keeping the isolated sampler design intact

Co-Authored-By: heihutu <heihutu@gmail.com>

---------

Co-authored-by: heihutu <heihutu@gmail.com>
This commit is contained in:
houseme
2026-07-08 23:51:34 +08:00
committed by GitHub
parent 6bdfdd164a
commit 6cb47049e8
7 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/memory_observability.rs
+9 -7
View File
@@ -13,8 +13,8 @@
// limitations under the License.
use rustfs_io_metrics::{
AllocatorMemoryObservation, record_allocator_memory_observation, record_cgroup_memory_split, record_cpu_usage,
record_memory_usage, record_process_memory_split, snapshot_process_resource_and_system,
AllocatorMemoryObservation, ProcessSampler, record_allocator_memory_observation, record_cgroup_memory_split,
record_cpu_usage, record_memory_usage, record_process_memory_split,
};
use serde::Serialize;
use serde_json::Value;
@@ -22,7 +22,7 @@ use std::collections::HashMap;
#[cfg(not(target_os = "windows"))]
use std::ffi::CStr;
use std::path::Path;
use std::sync::{Mutex, OnceLock};
use std::sync::{Arc, Mutex, OnceLock};
use std::time::Duration;
use sysinfo::System;
use tokio_util::sync::CancellationToken;
@@ -368,9 +368,10 @@ pub fn memory_observability_controller_snapshot(ctx: &CancellationToken) -> Memo
)
}
async fn record_memory_snapshot() {
match tokio::task::spawn_blocking(|| {
let (resource, process) = snapshot_process_resource_and_system();
async fn record_memory_snapshot(process_sampler: Arc<Mutex<ProcessSampler>>) {
match tokio::task::spawn_blocking(move || {
let mut sampler = process_sampler.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
let (resource, process) = sampler.snapshot_resource_and_system();
let total_memory = refresh_total_memory();
let cgroup = read_cgroup_memory_snapshot();
let allocator = read_allocator_memory_snapshot();
@@ -407,6 +408,7 @@ async fn record_memory_snapshot() {
pub fn init_memory_observability(ctx: CancellationToken) {
let interval_secs = configured_memory_observability_interval_secs();
let interval = Duration::from_secs(interval_secs.max(1));
let process_sampler = Arc::new(Mutex::new(ProcessSampler::new()));
tokio::spawn(async move {
let mut ticker = tokio::time::interval(interval);
@@ -419,7 +421,7 @@ pub fn init_memory_observability(ctx: CancellationToken) {
break;
}
_ = ticker.tick() => {
record_memory_snapshot().await;
record_memory_snapshot(Arc::clone(&process_sampler)).await;
}
}
}