From a1a30be7ea68ccd94cb02f2fba0a3435b616a455 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Fri, 27 Oct 2023 12:09:53 +0200 Subject: fix CacheBucket::CollectGarbage removing standalone entries without an exclusive lock (#502) --- src/zenserver/cache/cachedisklayer.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/zenserver/cache/cachedisklayer.cpp') diff --git a/src/zenserver/cache/cachedisklayer.cpp b/src/zenserver/cache/cachedisklayer.cpp index f755436e0..2efec1e66 100644 --- a/src/zenserver/cache/cachedisklayer.cpp +++ b/src/zenserver/cache/cachedisklayer.cpp @@ -1687,11 +1687,15 @@ ZenCacheDiskLayer::CacheBucket::CollectGarbage(GcContext& GcCtx, std::atomic_uin } if (GcCtx.IsDeletionMode()) { + IndexLock.ReleaseNow(); + RwLock::ExclusiveLockScope __(m_IndexLock); for (const auto& Entry : ExpiredStandaloneEntries) { - m_Index.erase(Entry.Key); - m_StandaloneSize.fetch_sub(Entry.Location.Size(), std::memory_order::relaxed); - DeletedChunks.insert(Entry.Key); + if (m_Index.erase(Entry.Key) == 1) + { + m_StandaloneSize.fetch_sub(Entry.Location.Size(), std::memory_order::relaxed); + DeletedChunks.insert(Entry.Key); + } } m_SlogFile.Append(ExpiredStandaloneEntries); } @@ -2875,7 +2879,6 @@ ZenCacheDiskLayer::MemCacheTrim() std::vector Buckets; { RwLock::SharedLockScope __(m_Lock); - RwLock::SharedLockScope _(m_Lock); Buckets.reserve(m_Buckets.size()); for (auto& Kv : m_Buckets) { -- cgit v1.2.3