mirror of
https://github.com/rustfs/rustfs.git
synced 2026-07-26 16:28:15 +00:00
904554b417
* fix(object-data-cache): bound cache config and make memory container-aware Harden the object data cache configuration path so a single bad input degrades to the disabled adapter instead of OOM-killing pods, panicking at boot, or silently mis-sizing the cache (backlog#1110/1113/1114/1115/ 1127/1140/1130). - ODC-05: resolve capacity and the fill gate from the effective (container-aware) memory. Prefer sysinfo cgroup_limits() and use min(host, cgroup) as the total plus cgroup-derived availability, falling back to host values when no cgroup limit constrains. Log the resolved capacity and its basis once at startup. - ODC-08: cap ttl/time_to_idle at 30 days in validate() so an unbounded Duration can no longer trip moka's ~1000-year builder assertion. - ODC-09: drop the max_entry_bytes floor from the derived-capacity clamp so MAX_ENTRY_BYTES can no longer inflate total capacity above the safety clamp; reject an entry larger than the resolved capacity instead. - ODC-10: require an explicit max_bytes to clear max_entry_bytes plus the weigher overhead so a fillable-but-unretainable cache is rejected. - ODC-22: reject max_entry_bytes at/above the u32 weigher boundary. - ODC-35: warn (not reject) when time_to_idle exceeds ttl and document the min(ttl, time_to_idle) expiry interaction. - ODC-25: give numeric env overrides two-valued semantics via a new rustfs_utils::get_env_parse_outcome; a malformed value now disables the whole cache with one aggregated warning instead of silently keeping defaults. Co-Authored-By: heihutu <heihutu@gmail.com> * fix(object-data-cache): require identity_keys_max of at least 2 The identity index admits a new key by evicting the oldest one, so a budget of 1 evicts the previous key on every fill and can never hold two live keys of one object at once — a versioned bucket alternating two versions then hits a permanent 0% hit rate. Reject the degenerate value at config validation time, where the adapter turns it into a disabled cache with a warning, since the bounded-eviction policy cannot rescue it at runtime. Handed off from the identity-index batch (backlog#1128), which changed the overflow policy but could not touch validate(). Refs: backlog#1115, backlog#1128 Co-Authored-By: heihutu <heihutu@gmail.com> * fix(object-data-cache): let a zero free-memory floor opt out of the gate Making the memory gate container-aware turned it live in CI: the runners are Kubernetes pods, so the gate now reads the pod's cgroup free memory, finds it below the 20% floor, and refuses the fill. Tests that assert a fill succeeds then failed on CI while passing on a developer host, which has no cgroup and falls back to host memory. The gate is behaving correctly — the tests were the ones depending on a live memory reading. Treat min_free_memory_percent = 0 as a deliberate opt-out rather than an invalid value: allows_fill returns early before it touches any snapshot, so admission becomes independent of where the suite runs. Operators gain the same escape hatch. Every test that requires a fill to succeed now sets the floor to 0. The tests that exercise the gate keep it enabled via memory_gated_config, so the ODC-05 coverage they provide is preserved rather than short-circuited. Refs: backlog#1110 Co-Authored-By: heihutu <heihutu@gmail.com> * fix(object-data-cache): opt the usecase fill tests out of the memory gate The previous commit exempted the fill-dependent tests it could find, but missed the six adapters built inside object_usecase.rs. Fixing the first batch moved nextest's fail-fast point forward and CI surfaced them: build_get_object_body_with_cache_materializes_once_and_hits_later and ..._uses_cached_body_without_reader_preread both assert a fill lands, and both ran with the default 20% free-memory floor. Set the floor to 0 on all six, matching the sibling test modules. Verified by pinning the gate's snapshot to 0% available — harsher than any CI pod — and confirming these tests still pass, which shows the exemption path never reads memory at all. An exhaustive sweep over every fill-enabled ObjectDataCacheConfig in the tree now shows no remaining site: the only unexempted ones are fill_enabled()'s matches! arm and two adapter tests that assert the adapter is disabled and therefore never fill. Refs: backlog#1110 Co-Authored-By: heihutu <heihutu@gmail.com> --------- Co-authored-by: heihutu <heihutu@gmail.com>
335 lines
12 KiB
Rust
335 lines
12 KiB
Rust
// Copyright 2024 RustFS Team
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use crate::config::ObjectDataCacheConfig;
|
|
use crate::metrics::record_memory_pressure;
|
|
use crate::stats::ObjectDataCacheStats;
|
|
use std::sync::atomic::{AtomicU64, Ordering};
|
|
use std::sync::{Arc, Mutex};
|
|
use std::time::{Duration, Instant};
|
|
use sysinfo::System;
|
|
|
|
const DEFAULT_REFRESH_INTERVAL: Duration = Duration::from_secs(5);
|
|
|
|
/// Source used to resolve the effective memory limits.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub(crate) enum MemoryBasis {
|
|
/// Limits come from host memory reported by sysinfo.
|
|
Host,
|
|
/// Limits come from a constraining cgroup (container) memory limit.
|
|
Cgroup,
|
|
}
|
|
|
|
impl MemoryBasis {
|
|
pub(crate) const fn as_str(self) -> &'static str {
|
|
match self {
|
|
Self::Host => "host",
|
|
Self::Cgroup => "cgroup",
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Effective memory totals after reconciling host memory with cgroup limits.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub(crate) struct EffectiveMemory {
|
|
/// Effective total memory in bytes.
|
|
pub(crate) total_bytes: u64,
|
|
/// Effective available memory in bytes.
|
|
pub(crate) available_bytes: u64,
|
|
/// Whether the limits are host- or cgroup-derived.
|
|
pub(crate) basis: MemoryBasis,
|
|
}
|
|
|
|
/// Reconciles host memory with an optional cgroup limit.
|
|
///
|
|
/// `cgroup` carries `(total_memory, free_memory)` as reported for the cgroup
|
|
/// hierarchy (sysinfo already caps `total_memory` at the host total). A cgroup
|
|
/// only counts when it actually constrains below the host, so an unlimited
|
|
/// cgroup transparently falls back to host values.
|
|
pub(crate) fn select_effective_memory(host_total: u64, host_available: u64, cgroup: Option<(u64, u64)>) -> EffectiveMemory {
|
|
match cgroup {
|
|
Some((cgroup_total, cgroup_free)) if cgroup_total > 0 && cgroup_total < host_total => EffectiveMemory {
|
|
total_bytes: cgroup_total,
|
|
available_bytes: cgroup_free.min(cgroup_total),
|
|
basis: MemoryBasis::Cgroup,
|
|
},
|
|
_ => EffectiveMemory {
|
|
total_bytes: host_total,
|
|
available_bytes: host_available,
|
|
basis: MemoryBasis::Host,
|
|
},
|
|
}
|
|
}
|
|
|
|
/// Resolves the effective memory from an already-refreshed system handle.
|
|
///
|
|
/// `cgroup_limits()` is computed fresh on each call and is only implemented on
|
|
/// Linux (it returns `None` elsewhere), so non-Linux hosts always use host
|
|
/// values.
|
|
pub(crate) fn effective_memory_from_system(system: &System) -> EffectiveMemory {
|
|
let cgroup = system.cgroup_limits().map(|limits| (limits.total_memory, limits.free_memory));
|
|
select_effective_memory(system.total_memory(), system.available_memory(), cgroup)
|
|
}
|
|
|
|
/// Resolves the effective memory using a fresh, memory-refreshed system handle.
|
|
pub(crate) fn resolve_effective_memory() -> EffectiveMemory {
|
|
let mut system = System::new();
|
|
system.refresh_memory();
|
|
effective_memory_from_system(&system)
|
|
}
|
|
|
|
/// Immutable memory snapshot used by the cache fill gate.
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub struct ObjectDataCacheMemorySnapshot {
|
|
/// Total system memory in bytes.
|
|
pub total_bytes: u64,
|
|
/// Available system memory in bytes.
|
|
pub available_bytes: u64,
|
|
}
|
|
|
|
impl ObjectDataCacheMemorySnapshot {
|
|
/// Returns the available memory percentage.
|
|
pub fn available_percent(&self) -> u8 {
|
|
if self.total_bytes == 0 {
|
|
return 0;
|
|
}
|
|
|
|
let percent = self.available_bytes.saturating_mul(100) / self.total_bytes;
|
|
u8::try_from(percent.min(100)).unwrap_or(100)
|
|
}
|
|
}
|
|
|
|
/// Memory gate that keeps a cheap snapshot for fill-path checks.
|
|
#[derive(Debug)]
|
|
pub struct ObjectDataCacheMemoryGate {
|
|
system: Mutex<System>,
|
|
last_refresh: Mutex<Instant>,
|
|
snapshot_total_bytes: AtomicU64,
|
|
snapshot_available_bytes: AtomicU64,
|
|
min_free_memory_percent: u8,
|
|
refresh_interval: Duration,
|
|
stats: Arc<ObjectDataCacheStats>,
|
|
#[cfg(test)]
|
|
test_override: Mutex<Option<ObjectDataCacheMemorySnapshot>>,
|
|
}
|
|
|
|
impl ObjectDataCacheMemoryGate {
|
|
/// Creates a new memory gate.
|
|
pub fn new(config: &ObjectDataCacheConfig, stats: Arc<ObjectDataCacheStats>) -> Self {
|
|
let mut system = System::new();
|
|
system.refresh_memory();
|
|
let effective = effective_memory_from_system(&system);
|
|
let snapshot = ObjectDataCacheMemorySnapshot {
|
|
total_bytes: effective.total_bytes,
|
|
available_bytes: effective.available_bytes,
|
|
};
|
|
|
|
Self {
|
|
system: Mutex::new(system),
|
|
last_refresh: Mutex::new(Instant::now()),
|
|
snapshot_total_bytes: AtomicU64::new(snapshot.total_bytes),
|
|
snapshot_available_bytes: AtomicU64::new(snapshot.available_bytes),
|
|
min_free_memory_percent: config.min_free_memory_percent,
|
|
refresh_interval: DEFAULT_REFRESH_INTERVAL,
|
|
stats,
|
|
#[cfg(test)]
|
|
test_override: Mutex::new(None),
|
|
}
|
|
}
|
|
|
|
/// Returns the current atomic memory snapshot.
|
|
pub fn snapshot(&self) -> ObjectDataCacheMemorySnapshot {
|
|
#[cfg(test)]
|
|
{
|
|
if let Some(snapshot) = *lock_or_recover(&self.test_override) {
|
|
return snapshot;
|
|
}
|
|
}
|
|
|
|
ObjectDataCacheMemorySnapshot {
|
|
total_bytes: self.snapshot_total_bytes.load(Ordering::Relaxed),
|
|
available_bytes: self.snapshot_available_bytes.load(Ordering::Relaxed),
|
|
}
|
|
}
|
|
|
|
/// Refreshes the snapshot if it is stale.
|
|
pub fn refresh_if_stale(&self) {
|
|
{
|
|
let last_refresh = lock_or_recover(&self.last_refresh);
|
|
if last_refresh.elapsed() < self.refresh_interval {
|
|
return;
|
|
}
|
|
}
|
|
|
|
let mut system = lock_or_recover(&self.system);
|
|
system.refresh_memory();
|
|
let effective = effective_memory_from_system(&system);
|
|
let snapshot = ObjectDataCacheMemorySnapshot {
|
|
total_bytes: effective.total_bytes,
|
|
available_bytes: effective.available_bytes,
|
|
};
|
|
|
|
self.snapshot_total_bytes.store(snapshot.total_bytes, Ordering::Relaxed);
|
|
self.snapshot_available_bytes
|
|
.store(snapshot.available_bytes, Ordering::Relaxed);
|
|
*lock_or_recover(&self.last_refresh) = Instant::now();
|
|
}
|
|
|
|
/// Returns true when the fill path may proceed under current memory pressure.
|
|
pub fn allows_fill(&self, required_bytes: u64) -> bool {
|
|
// A zero floor opts out of the gate, so fill admission never depends on
|
|
// a live memory reading — which differs between a host and a container.
|
|
if self.min_free_memory_percent == 0 {
|
|
return true;
|
|
}
|
|
|
|
self.refresh_if_stale();
|
|
let snapshot = self.snapshot();
|
|
if snapshot.total_bytes == 0 {
|
|
return true;
|
|
}
|
|
|
|
let min_free = u64::from(self.min_free_memory_percent);
|
|
let has_percent_budget = snapshot.available_bytes.saturating_mul(100) >= snapshot.total_bytes.saturating_mul(min_free);
|
|
let has_entry_budget = snapshot.available_bytes >= required_bytes;
|
|
let allowed = has_percent_budget && has_entry_budget;
|
|
|
|
if !allowed {
|
|
record_memory_pressure(&self.stats, "moka");
|
|
}
|
|
|
|
allowed
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub fn set_test_snapshot(&self, snapshot: Option<ObjectDataCacheMemorySnapshot>) {
|
|
*lock_or_recover(&self.test_override) = snapshot;
|
|
}
|
|
}
|
|
|
|
fn lock_or_recover<T>(mutex: &Mutex<T>) -> std::sync::MutexGuard<'_, T> {
|
|
match mutex.lock() {
|
|
Ok(guard) => guard,
|
|
Err(poisoned) => poisoned.into_inner(),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::{MemoryBasis, ObjectDataCacheMemoryGate, ObjectDataCacheMemorySnapshot, select_effective_memory};
|
|
use crate::config::ObjectDataCacheConfig;
|
|
use crate::stats::ObjectDataCacheStats;
|
|
use std::sync::Arc;
|
|
|
|
const GIB: u64 = 1024 * 1024 * 1024;
|
|
|
|
#[test]
|
|
fn select_effective_memory_prefers_constraining_cgroup() {
|
|
let effective = select_effective_memory(64 * GIB, 40 * GIB, Some((2 * GIB, GIB)));
|
|
|
|
assert_eq!(effective.basis, MemoryBasis::Cgroup);
|
|
assert_eq!(effective.total_bytes, 2 * GIB);
|
|
assert_eq!(effective.available_bytes, GIB);
|
|
}
|
|
|
|
#[test]
|
|
fn select_effective_memory_ignores_non_constraining_cgroup() {
|
|
// A cgroup total equal to (or above) the host total means no real limit.
|
|
let effective = select_effective_memory(64 * GIB, 40 * GIB, Some((64 * GIB, 10 * GIB)));
|
|
|
|
assert_eq!(effective.basis, MemoryBasis::Host);
|
|
assert_eq!(effective.total_bytes, 64 * GIB);
|
|
assert_eq!(effective.available_bytes, 40 * GIB);
|
|
}
|
|
|
|
#[test]
|
|
fn select_effective_memory_falls_back_to_host_without_cgroup() {
|
|
let effective = select_effective_memory(8 * GIB, 4 * GIB, None);
|
|
|
|
assert_eq!(effective.basis, MemoryBasis::Host);
|
|
assert_eq!(effective.total_bytes, 8 * GIB);
|
|
assert_eq!(effective.available_bytes, 4 * GIB);
|
|
}
|
|
|
|
#[test]
|
|
fn select_effective_memory_caps_available_at_total() {
|
|
let effective = select_effective_memory(64 * GIB, 40 * GIB, Some((2 * GIB, 3 * GIB)));
|
|
|
|
assert_eq!(effective.total_bytes, 2 * GIB);
|
|
assert_eq!(effective.available_bytes, 2 * GIB);
|
|
}
|
|
|
|
#[test]
|
|
fn gate_pauses_fill_when_container_memory_is_low() {
|
|
// Simulate a pod-sized snapshot (256 MiB total, 16 MiB free): below the
|
|
// default 20% free-memory floor, so fills must pause even though a node
|
|
// would have plenty of headroom.
|
|
let stats = Arc::new(ObjectDataCacheStats::default());
|
|
let gate = ObjectDataCacheMemoryGate::new(&ObjectDataCacheConfig::default(), Arc::clone(&stats));
|
|
gate.set_test_snapshot(Some(ObjectDataCacheMemorySnapshot {
|
|
total_bytes: 256 * 1024 * 1024,
|
|
available_bytes: 16 * 1024 * 1024,
|
|
}));
|
|
|
|
assert!(!gate.allows_fill(1024));
|
|
assert_eq!(stats.snapshot().memory_pressure_events, 1);
|
|
}
|
|
|
|
#[test]
|
|
fn allows_fill_when_memory_snapshot_has_headroom() {
|
|
let stats = Arc::new(ObjectDataCacheStats::default());
|
|
let gate = ObjectDataCacheMemoryGate::new(&ObjectDataCacheConfig::default(), Arc::clone(&stats));
|
|
gate.set_test_snapshot(Some(ObjectDataCacheMemorySnapshot {
|
|
total_bytes: 1_000,
|
|
available_bytes: 500,
|
|
}));
|
|
|
|
assert!(gate.allows_fill(100));
|
|
}
|
|
|
|
#[test]
|
|
fn zero_min_free_percent_disables_the_gate() {
|
|
// A pod-sized snapshot far below any floor: the gate is opted out, so
|
|
// fill admission stays independent of the live memory reading.
|
|
let stats = Arc::new(ObjectDataCacheStats::default());
|
|
let gate = ObjectDataCacheMemoryGate::new(
|
|
&ObjectDataCacheConfig {
|
|
min_free_memory_percent: 0,
|
|
..ObjectDataCacheConfig::default()
|
|
},
|
|
Arc::clone(&stats),
|
|
);
|
|
gate.set_test_snapshot(Some(ObjectDataCacheMemorySnapshot {
|
|
total_bytes: 1_000,
|
|
available_bytes: 1,
|
|
}));
|
|
|
|
assert!(gate.allows_fill(512));
|
|
assert_eq!(stats.snapshot().memory_pressure_events, 0);
|
|
}
|
|
|
|
#[test]
|
|
fn blocks_fill_under_memory_pressure() {
|
|
let stats = Arc::new(ObjectDataCacheStats::default());
|
|
let gate = ObjectDataCacheMemoryGate::new(&ObjectDataCacheConfig::default(), Arc::clone(&stats));
|
|
gate.set_test_snapshot(Some(ObjectDataCacheMemorySnapshot {
|
|
total_bytes: 1_000,
|
|
available_bytes: 100,
|
|
}));
|
|
|
|
assert!(!gate.allows_fill(128));
|
|
assert_eq!(stats.snapshot().memory_pressure_events, 1);
|
|
}
|
|
}
|