From f7927ad8e34bc6224765bb159644304f253cc577 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Fri, 12 May 2023 21:35:32 +0200 Subject: wipe cache buckets block store that may contain invalid state (#300) * wipe cache buckets block store that may contain invalid state * Update CHANGELOG.md --- src/zenserver/cache/structuredcachestore.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/zenserver/cache/structuredcachestore.cpp') diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp index 2fd8e8be8..7368d45da 100644 --- a/src/zenserver/cache/structuredcachestore.cpp +++ b/src/zenserver/cache/structuredcachestore.cpp @@ -49,6 +49,12 @@ namespace { #pragma pack(push) #pragma pack(1) + // We use this to indicate if a on disk bucket needs wiping + // In version 0.2.5 -> 0.2.11 there was a GC corruption bug that would scrable the references + // to block items. + // See: https://github.com/EpicGames/zen/pull/299 + static const uint32_t CurrentDiskBucketVersion = 1; + struct CacheBucketIndexHeader { static constexpr uint32_t ExpectedMagic = 0x75696478; // 'uidx'; @@ -720,6 +726,12 @@ ZenCacheDiskLayer::CacheBucket::OpenOrCreate(std::filesystem::path BucketDir, bo { return false; } + uint32_t Version = Manifest["Version"sv].AsUInt32(0); + if (Version != CurrentDiskBucketVersion) + { + ZEN_INFO("Wiping bucket '{}', found version {}, required version {}", BucketDir, Version, CurrentDiskBucketVersion); + IsNew = true; + } } else if (AllowCreate) { @@ -727,6 +739,7 @@ ZenCacheDiskLayer::CacheBucket::OpenOrCreate(std::filesystem::path BucketDir, bo CbObjectWriter Writer; Writer << "BucketId"sv << m_BucketId; + Writer << "Version"sv << CurrentDiskBucketVersion; Manifest = Writer.Save(); SaveCompactBinaryObject(ManifestPath, Manifest); IsNew = true; @@ -1250,6 +1263,7 @@ ZenCacheDiskLayer::CacheBucket::SaveManifest() CbObjectWriter Writer; Writer << "BucketId"sv << m_BucketId; + Writer << "Version"sv << CurrentDiskBucketVersion; if (!m_Index.empty()) { -- cgit v1.2.3