From 2542797c56b84473395a877376b68fcc77687ea9 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan.engelbrecht@epicgames.com>
Date: Tue, 9 May 2023 15:11:10 +0200
Subject: Low disk space detector (#277)

* - Feature: Disk writes are now blocked early and return an insufficient storage error if free disk space falls below the `--low-diskspace-threshold` value
* Never keep an entry in m_ChunkBlocks that points to a nullptr
---
 src/zenserver/zenserver.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/zenserver/zenserver.cpp')

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 75a49367c..c6ec4b82b 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -394,14 +394,16 @@ public:
 		}
 
 		ZEN_INFO("initializing GC, enabled '{}', interval {}s", ServerOptions.GcConfig.Enabled, ServerOptions.GcConfig.IntervalSeconds);
-		zen::GcSchedulerConfig GcConfig{.RootDirectory		 = m_DataRoot / "gc",
-										.MonitorInterval	 = std::chrono::seconds(ServerOptions.GcConfig.MonitorIntervalSeconds),
-										.Interval			 = std::chrono::seconds(ServerOptions.GcConfig.IntervalSeconds),
-										.MaxCacheDuration	 = std::chrono::seconds(ServerOptions.GcConfig.Cache.MaxDurationSeconds),
-										.CollectSmallObjects = ServerOptions.GcConfig.CollectSmallObjects,
-										.Enabled			 = ServerOptions.GcConfig.Enabled,
-										.DiskReserveSize	 = ServerOptions.GcConfig.DiskReserveSize,
-										.DiskSizeSoftLimit	 = ServerOptions.GcConfig.Cache.DiskSizeSoftLimit};
+		zen::GcSchedulerConfig GcConfig{
+			.RootDirectory					   = m_DataRoot / "gc",
+			.MonitorInterval				   = std::chrono::seconds(ServerOptions.GcConfig.MonitorIntervalSeconds),
+			.Interval						   = std::chrono::seconds(ServerOptions.GcConfig.IntervalSeconds),
+			.MaxCacheDuration				   = std::chrono::seconds(ServerOptions.GcConfig.Cache.MaxDurationSeconds),
+			.CollectSmallObjects			   = ServerOptions.GcConfig.CollectSmallObjects,
+			.Enabled						   = ServerOptions.GcConfig.Enabled,
+			.DiskReserveSize				   = ServerOptions.GcConfig.DiskReserveSize,
+			.DiskSizeSoftLimit				   = ServerOptions.GcConfig.Cache.DiskSizeSoftLimit,
+			.MinimumFreeDiskSpaceToAllowWrites = ServerOptions.GcConfig.Cache.MinimumFreeDiskSpaceToAllowWrites};
 		m_GcScheduler.Initialize(GcConfig);
 
 		return EffectiveBasePort;
@@ -845,8 +847,12 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 		}
 	}
 
-	m_StructuredCacheService =
-		std::make_unique<HttpStructuredCacheService>(*m_CacheStore, *m_CidStore, m_StatsService, m_StatusService, *m_UpstreamCache);
+	m_StructuredCacheService = std::make_unique<HttpStructuredCacheService>(*m_CacheStore,
+																			*m_CidStore,
+																			m_StatsService,
+																			m_StatusService,
+																			*m_UpstreamCache,
+																			m_GcManager.GetDiskWriteBlocker());
 
 	m_Http->RegisterService(*m_StructuredCacheService);
 	m_Http->RegisterService(*m_UpstreamService);
-- 
cgit v1.2.3