Merge branch 'main' into zs/put-overwrite-policy

1 files changed, 23 insertions, 4 deletions

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 7e3baa997..6c9f2ed21 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -265,10 +265,15 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 
 	if (ServerOptions.BuildStoreConfig.Enabled)
 	{
+		CidStoreConfiguration BuildCidConfig;
+		BuildCidConfig.RootDirectory = m_DataRoot / "builds_cas";
+		m_BuildCidStore				 = std::make_unique<CidStore>(m_GcManager);
+		m_BuildCidStore->Initialize(BuildCidConfig);
+
 		BuildStoreConfig BuildsCfg;
 		BuildsCfg.RootDirectory		= m_DataRoot / "builds";
 		BuildsCfg.MaxDiskSpaceLimit = ServerOptions.BuildStoreConfig.MaxDiskSpaceLimit;
-		m_BuildStore				= std::make_unique<BuildStore>(std::move(BuildsCfg), m_GcManager);
+		m_BuildStore				= std::make_unique<BuildStore>(std::move(BuildsCfg), m_GcManager, *m_BuildCidStore);
 	}
 
 	if (ServerOptions.StructuredCacheConfig.Enabled)
@@ -666,6 +671,7 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions)
 
 	m_StatsReporter.AddProvider(m_CacheStore.Get());
 	m_StatsReporter.AddProvider(m_CidStore.get());
+	m_StatsReporter.AddProvider(m_BuildCidStore.get());
 }
 
 void
@@ -838,6 +844,7 @@ ZenServer::Cleanup()
 
 		m_BuildStoreService.reset();
 		m_BuildStore = {};
+		m_BuildCidStore.reset();
 
 		m_StructuredCacheService.reset();
 		m_UpstreamService.reset();
@@ -1037,9 +1044,18 @@ ZenServer::ScrubStorage()
 
 	WorkerThreadPool ThreadPool{1, "Scrub"};
 	ScrubContext	 Ctx{ThreadPool};
-	m_CidStore->ScrubStorage(Ctx);
-	m_ProjectStore->ScrubStorage(Ctx);
-	m_StructuredCacheService->ScrubStorage(Ctx);
+
+	if (m_CidStore)
+		m_CidStore->ScrubStorage(Ctx);
+
+	if (m_ProjectStore)
+		m_ProjectStore->ScrubStorage(Ctx);
+
+	if (m_StructuredCacheService)
+		m_StructuredCacheService->ScrubStorage(Ctx);
+
+	if (m_BuildCidStore)
+		m_BuildCidStore->ScrubStorage(Ctx);
 
 	const uint64_t ElapsedTimeMs = Timer.GetElapsedTimeMs();
 
@@ -1061,6 +1077,9 @@ ZenServer::Flush()
 
 	if (m_ProjectStore)
 		m_ProjectStore->Flush();
+
+	if (m_BuildCidStore)
+		m_BuildCidStore->Flush();
 }
 
 void