1 files changed, 47 insertions, 26 deletions

diff --git a/src/zenremotestore/builds/buildstoragecache.cpp b/src/zenremotestore/builds/buildstoragecache.cpp
index 0e0b14dca..8fd31a326 100644
--- a/src/zenremotestore/builds/buildstoragecache.cpp
+++ b/src/zenremotestore/builds/buildstoragecache.cpp
@@ -96,7 +96,8 @@ public:
 		ZEN_ASSERT(!IsFlushed);
 		ZEN_ASSERT(ContentType == ZenContentType::kCompressedBinary);
 
-		// Move all segments in Payload to be file handle based so if Payload is materialized it does not affect buffers in queue
+		// Move all segments in Payload to be file handle based unless they are very small so if Payload is materialized it does not affect
+		// buffers in queue
 		std::vector<SharedBuffer>	  FileBasedSegments;
 		std::span<const SharedBuffer> Segments = Payload.GetSegments();
 		FileBasedSegments.reserve(Segments.size());
@@ -104,42 +105,56 @@ public:
 			tsl::robin_map<void*, std::filesystem::path> HandleToPath;
 			for (const SharedBuffer& Segment : Segments)
 			{
-				std::filesystem::path FilePath;
-				IoBufferFileReference Ref;
-				if (Segment.AsIoBuffer().GetFileReference(Ref))
+				const uint64_t SegmentSize = Segment.GetSize();
+				if (SegmentSize < 16u * 1024u)
 				{
-					if (auto It = HandleToPath.find(Ref.FileHandle); It != HandleToPath.end())
-					{
-						FilePath = It->second;
-					}
-					else
+					FileBasedSegments.push_back(Segment);
+				}
+				else
+				{
+					std::filesystem::path FilePath;
+					IoBufferFileReference Ref;
+					if (Segment.AsIoBuffer().GetFileReference(Ref))
 					{
-						std::error_code		  Ec;
-						std::filesystem::path Path = PathFromHandle(Ref.FileHandle, Ec);
-						if (!Ec && !Path.empty())
+						if (auto It = HandleToPath.find(Ref.FileHandle); It != HandleToPath.end())
+						{
+							FilePath = It->second;
+						}
+						else
 						{
-							HandleToPath.insert_or_assign(Ref.FileHandle, Path);
-							FilePath = std::move(Path);
+							std::error_code		  Ec;
+							std::filesystem::path Path = PathFromHandle(Ref.FileHandle, Ec);
+							if (!Ec && !Path.empty())
+							{
+								HandleToPath.insert_or_assign(Ref.FileHandle, Path);
+								FilePath = std::move(Path);
+							}
+							else
+							{
+								ZEN_WARN("Failed getting path for chunk to upload to cache. Skipping upload.");
+								return;
+							}
 						}
 					}
-				}
 
-				if (!FilePath.empty())
-				{
-					IoBuffer BufferFromFile = IoBufferBuilder::MakeFromFile(FilePath, Ref.FileChunkOffset, Ref.FileChunkSize);
-					if (BufferFromFile)
+					if (!FilePath.empty())
 					{
-						FileBasedSegments.push_back(SharedBuffer(std::move(BufferFromFile)));
+						IoBuffer BufferFromFile = IoBufferBuilder::MakeFromFile(FilePath, Ref.FileChunkOffset, Ref.FileChunkSize);
+						if (BufferFromFile)
+						{
+							FileBasedSegments.push_back(SharedBuffer(std::move(BufferFromFile)));
+						}
+						else
+						{
+							ZEN_WARN("Failed opening file '{}' to upload to cache. Skipping upload.", FilePath);
+							return;
+						}
 					}
 					else
 					{
 						FileBasedSegments.push_back(Segment);
 					}
 				}
-				else
-				{
-					FileBasedSegments.push_back(Segment);
-				}
 			}
 		}
 
@@ -178,7 +193,10 @@ public:
 		{
 			Headers.Entries.insert({"Range", fmt::format("bytes={}-{}", RangeOffset, RangeOffset + RangeBytes - 1)});
 		}
-		CreateDirectories(m_TempFolderPath);
+		if (!m_TempFolderPath.empty())
+		{
+			CreateDirectories(m_TempFolderPath);
+		}
 		HttpClient::Response CacheResponse =
 			m_HttpClient.Download(fmt::format("/builds/{}/{}/{}/blobs/{}", m_Namespace, m_Bucket, BuildId, RawHash),
 								  m_TempFolderPath,
@@ -215,7 +233,10 @@ public:
 		}
 		Writer.EndArray();	// ranges
 
-		CreateDirectories(m_TempFolderPath);
+		if (!m_TempFolderPath.empty())
+		{
+			CreateDirectories(m_TempFolderPath);
+		}
 		HttpClient::Response CacheResponse =
 			m_HttpClient.Post(fmt::format("/builds/{}/{}/{}/blobs/{}", m_Namespace, m_Bucket, BuildId, RawHash),
 							  Writer.Save(),