mirror of
https://github.com/rustfs/rustfs.git
synced 2026-07-26 08:18:18 +00:00
eebd16d8a4
* feat(cache): add object data cache engine * feat(cache): wire app-layer object cache flow * refactor(cache): streamline app-layer cache flow * refactor(cache): tighten cache flow internals * refactor: address final clippy cleanup * chore(deps): update quick-xml to 0.41.0 * feat(cache): wire object data cache env config * fix(cache): gate materialize fill by cache plan * chore(cache): add object data cache benchmark gate * fix(cache): guard object cache fill size mismatches * refactor(cache): streamline object cache body planning * fix(cache): align object cache rollout config * test(cache): cover buffered object cache benchmark * test(cache): isolate object cache benchmark metrics * test(cache): mark materialize rollout experimental * test(cache): tighten object cache benchmark gate * fix(cache): address review findings for object data cache - singleflight: clean up leader entry on cancellation (Drop impl) so a dropped GET future can no longer wedge all subsequent fills for the same key; switch the fill map to a std Mutex and add a regression test - adapter: honor RUSTFS_OBJECT_DATA_CACHE_ENABLE=true by defaulting to hit_only when no explicit mode is set (explicit mode still wins) - planner: treat nil version UUIDs as "no value" per repo convention so unversioned objects key under the canonical "null" instead of fragmenting the key space - multipart: invalidate the object cache on the quota-exceeded rollback delete after complete-multipart, closing a stale-cache window - layering: move the disabled-cache fallback into app::context and drop the new infra->app layer-dependency baseline entry * fix(cache): close invalidation races and drop full-cache scan on writes - index: make identity-index insert/remove/prune atomic via starshard compute_if_present/compute_if_absent so concurrent fills can no longer drop each other's keys (lost keys made entries unreachable to invalidation until TTL); add a concurrency regression test - fill: register the key in the identity index before the entry becomes visible in the cache and re-check the index afterwards, undoing the fill when an invalidation raced in between (new skipped_invalidation_race fill result) - invalidate: with the index now authoritative, remove the full-cache iter() fallback that made every PUT/DELETE of a never-cached object O(total cache entries) (two scans per PUT, 2N per batch delete) - materialize-fill: fail the GET instead of falling back to the partially consumed stream after a mid-read error (the fallback would send a body missing its prefix under a full-length Content-Length), and log the same size-mismatch warning as the sibling buffering paths Co-Authored-By: heihutu <heihutu@gmail.com> * test(storage): fix media-dependent buffer clamp expectation test_concurrency_manager_multi_factor_strategy_buffer_clamp asserted media_cap.min(MI_B), but the implementation's final safety clamp is [32KiB, media_cap.max(MI_B)] — deliberately so a media cap above 1MiB (NVMe's 2MiB default) stays effective. The test only passed on machines detected as SSD/Unknown (cap == 1MiB) and failed on NVMe-backed CI runners with 2MiB != 1MiB. Assert the media cap itself, which is what the strategy actually guarantees on every environment. Co-Authored-By: heihutu <heihutu@gmail.com> * test(storage): format buffer clamp assertion * chore(logging): update tier guardrail path --------- Signed-off-by: houseme <housemecn@gmail.com> Co-authored-by: cxymds <cxymds@gmail.com> Co-authored-by: overtrue <anzhengchao@gmail.com> Co-authored-by: heihutu <heihutu@gmail.com>
134 lines
4.4 KiB
Rust
134 lines
4.4 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 std::sync::atomic::{AtomicU64, Ordering};
|
|
|
|
/// Cache statistics holder for the engine skeleton.
|
|
#[derive(Debug, Default)]
|
|
pub struct ObjectDataCacheStats {
|
|
entries: AtomicU64,
|
|
lookups: AtomicU64,
|
|
hits: AtomicU64,
|
|
fills: AtomicU64,
|
|
invalidations: AtomicU64,
|
|
inflight_fills: AtomicU64,
|
|
singleflight_joins: AtomicU64,
|
|
memory_pressure_events: AtomicU64,
|
|
}
|
|
|
|
/// Immutable snapshot of cache statistics.
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub struct ObjectDataCacheStatsSnapshot {
|
|
/// Number of cached entries.
|
|
pub entries: u64,
|
|
/// Total lookup attempts.
|
|
pub lookups: u64,
|
|
/// Total cache hits.
|
|
pub hits: u64,
|
|
/// Total fill attempts.
|
|
pub fills: u64,
|
|
/// Total invalidation attempts.
|
|
pub invalidations: u64,
|
|
/// Current number of in-flight fills.
|
|
pub inflight_fills: u64,
|
|
/// Number of singleflight joiners.
|
|
pub singleflight_joins: u64,
|
|
/// Number of times fill was skipped under memory pressure.
|
|
pub memory_pressure_events: u64,
|
|
}
|
|
|
|
impl ObjectDataCacheStats {
|
|
/// Updates the current entry count snapshot.
|
|
pub fn set_entries(&self, entries: u64) {
|
|
self.entries.store(entries, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Records a cache lookup attempt.
|
|
pub fn record_lookup(&self, hit: bool) {
|
|
self.lookups.fetch_add(1, Ordering::Relaxed);
|
|
if hit {
|
|
self.hits.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
}
|
|
|
|
/// Records a cache fill attempt.
|
|
pub fn record_fill(&self) {
|
|
self.fills.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Records a cache invalidation attempt.
|
|
pub fn record_invalidation(&self) {
|
|
self.invalidations.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Sets the current number of in-flight fills.
|
|
pub fn set_inflight_fills(&self, inflight_fills: usize) {
|
|
let value = u64::try_from(inflight_fills).unwrap_or(u64::MAX);
|
|
self.inflight_fills.store(value, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Records a singleflight join.
|
|
pub fn record_singleflight_join(&self) {
|
|
self.singleflight_joins.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Records a memory pressure event.
|
|
pub fn record_memory_pressure(&self) {
|
|
self.memory_pressure_events.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
|
|
/// Returns the current immutable stats snapshot.
|
|
pub fn snapshot(&self) -> ObjectDataCacheStatsSnapshot {
|
|
ObjectDataCacheStatsSnapshot {
|
|
entries: self.entries.load(Ordering::Relaxed),
|
|
lookups: self.lookups.load(Ordering::Relaxed),
|
|
hits: self.hits.load(Ordering::Relaxed),
|
|
fills: self.fills.load(Ordering::Relaxed),
|
|
invalidations: self.invalidations.load(Ordering::Relaxed),
|
|
inflight_fills: self.inflight_fills.load(Ordering::Relaxed),
|
|
singleflight_joins: self.singleflight_joins.load(Ordering::Relaxed),
|
|
memory_pressure_events: self.memory_pressure_events.load(Ordering::Relaxed),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::ObjectDataCacheStats;
|
|
|
|
#[test]
|
|
fn snapshot_reflects_recorded_counters() {
|
|
let stats = ObjectDataCacheStats::default();
|
|
stats.set_entries(3);
|
|
stats.record_lookup(true);
|
|
stats.record_lookup(false);
|
|
stats.record_fill();
|
|
stats.record_invalidation();
|
|
stats.set_inflight_fills(2);
|
|
stats.record_singleflight_join();
|
|
stats.record_memory_pressure();
|
|
|
|
let snapshot = stats.snapshot();
|
|
|
|
assert_eq!(snapshot.entries, 3);
|
|
assert_eq!(snapshot.lookups, 2);
|
|
assert_eq!(snapshot.hits, 1);
|
|
assert_eq!(snapshot.fills, 1);
|
|
assert_eq!(snapshot.invalidations, 1);
|
|
assert_eq!(snapshot.inflight_fills, 2);
|
|
assert_eq!(snapshot.singleflight_joins, 1);
|
|
assert_eq!(snapshot.memory_pressure_events, 1);
|
|
}
|
|
}
|