1 files changed, 41 insertions, 0 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index c0cd858b6..437b29cd7 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -780,6 +780,47 @@ public:
 		return {};
 	}
 
+	virtual GetUpstreamCacheBatchResult GetCacheRecords(std::span<CacheKey> CacheKeys,
+														std::span<size_t>	KeyIndex,
+														OnCacheGetComplete	OnComplete) override
+	{
+		if (!m_Options.ReadUpstream)
+		{
+			return {.Missing = std::vector<size_t>(KeyIndex.begin(), KeyIndex.end())};
+		}
+
+		GetUpstreamCacheBatchResult Result;
+
+		for (size_t Idx : KeyIndex)
+		{
+			const UpstreamCacheKey CacheKey = {CacheKeys[Idx].Bucket, CacheKeys[Idx].Hash};
+
+			GetUpstreamCacheResult CacheResult;
+			for (auto& Endpoint : m_Endpoints)
+			{
+				if (Endpoint->IsHealthy())
+				{
+					CacheResult = Endpoint->GetCacheRecord(CacheKey, ZenContentType::kCbPackage);
+					if (CacheResult.Success)
+					{
+						break;
+					}
+				}
+			}
+
+			if (CacheResult.Success)
+			{
+				OnComplete(Idx, CacheResult.Value);
+			}
+			else
+			{
+				Result.Missing.push_back(Idx);
+			}
+		}
+
+		return Result;
+	}
+
 	virtual GetUpstreamCacheResult GetCachePayload(UpstreamPayloadKey PayloadKey) override
 	{
 		if (m_Options.ReadUpstream)