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

fix(cache): drain entries before clear returns (#4751)

Browse Source
This commit is contained in:
Zhengchao An
2026-07-12 04:32:21 +08:00
committed by GitHub
parent b449af160c
commit af831bde4b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/object-data-cache/src/moka_backend.rs
+2 -2
View File
@@ -331,6 +331,7 @@ impl MokaBackend {
pub async fn clear(&self) -> ObjectDataCacheInvalidationResult { pub async fn clear(&self) -> ObjectDataCacheInvalidationResult {
let removed = self.index.remove_matching(|_| true).await.len(); let removed = self.index.remove_matching(|_| true).await.len();
self.cache.invalidate_all(); self.cache.invalidate_all();
self.cache.run_pending_tasks().await;
Self::invalidation_result(removed) Self::invalidation_result(removed)
} }
@@ -536,6 +537,7 @@ mod tests {
assert_eq!(result, ObjectDataCacheInvalidationResult::Removed { keys: 2 }); assert_eq!(result, ObjectDataCacheInvalidationResult::Removed { keys: 2 });
assert!(matches!(backend.lookup_body(&plan_a).await, ObjectDataCacheLookup::Miss)); assert!(matches!(backend.lookup_body(&plan_a).await, ObjectDataCacheLookup::Miss));
assert!(matches!(backend.lookup_body(&plan_b).await, ObjectDataCacheLookup::Miss)); assert!(matches!(backend.lookup_body(&plan_b).await, ObjectDataCacheLookup::Miss));
assert_eq!(backend.entry_count(), 0, "clear must drain cached entries before returning");
assert_eq!(backend.index.identity_count().await, 0, "clear must empty the identity index"); assert_eq!(backend.index.identity_count().await, 0, "clear must empty the identity index");
} }
@@ -954,9 +956,7 @@ mod tests {
"invalidation must still win after a concurrency storm" "invalidation must still win after a concurrency storm"
); );
// clear() plus a moka drain empties both the cache and the identity index.
let _ = backend.clear().await; let _ = backend.clear().await;
backend.cache.run_pending_tasks().await;
assert_eq!(backend.entry_count(), 0, "clear() must drop every entry"); assert_eq!(backend.entry_count(), 0, "clear() must drop every entry");
} }