From 5361ee1c77b68bb14237169660840d6d63a74892 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Fri, 3 Oct 2025 12:38:35 +0200 Subject: remove zenutil dependency in zenremotestore (#547) * remove dependency to zenutil/workerpools.h from remoteprojectstore.cpp * remove dependency to zenutil/workerpools.h from buildstoragecache.cpp * remove unneded include * move jupiter helpers to zenremotestore * move parallelwork to zencore * remove zenutil dependency from zenremotestore * clean up test project dependencies - use indirect dependencies --- src/zenserver/projectstore/httpprojectstore.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'src/zenserver/projectstore/httpprojectstore.cpp') diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp index 9fc9e4605..8f2dbd830 100644 --- a/src/zenserver/projectstore/httpprojectstore.cpp +++ b/src/zenserver/projectstore/httpprojectstore.cpp @@ -2468,10 +2468,13 @@ HttpProjectService::HandleOplogLoadRequest(HttpRouterRequest& Req) } } + WorkerThreadPool& WorkerPool = GetLargeWorkerPool(EWorkloadType::Background); + RemoteProjectStore::LoadContainerResult ContainerResult = BuildContainer( m_CidStore, *Project, *Oplog, + WorkerPool, MaxBlockSize, MaxChunkEmbedSize, MaxChunksPerBlock, @@ -2643,9 +2646,19 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req) Oplog->OplogId(), ActualRemoteStore->GetInfo().Description)); - RemoteProjectStore::Result Result = - LoadOplog(m_CidStore, *ActualRemoteStore, *Oplog, Force, IgnoreMissingAttachments, CleanOplog, &Context); - auto Response = ConvertResult(Result); + WorkerThreadPool& WorkerPool = GetLargeWorkerPool(EWorkloadType::Background); + WorkerThreadPool& NetworkWorkerPool = GetMediumWorkerPool(EWorkloadType::Background); + + RemoteProjectStore::Result Result = LoadOplog(m_CidStore, + *ActualRemoteStore, + *Oplog, + NetworkWorkerPool, + WorkerPool, + Force, + IgnoreMissingAttachments, + CleanOplog, + &Context); + auto Response = ConvertResult(Result); ZEN_INFO("LoadOplog: Status: {} '{}'", ToString(Response.first), Response.second); if (!IsHttpSuccessCode(Response.first)) { @@ -2697,10 +2710,15 @@ HttpProjectService::HandleRpcRequest(HttpRouterRequest& Req) NiceBytes(MaxBlockSize), NiceBytes(MaxChunkEmbedSize))); + WorkerThreadPool& WorkerPool = GetLargeWorkerPool(EWorkloadType::Background); + WorkerThreadPool& NetworkWorkerPool = GetMediumWorkerPool(EWorkloadType::Background); + RemoteProjectStore::Result Result = SaveOplog(m_CidStore, *ActualRemoteStore, *Project, *Oplog, + NetworkWorkerPool, + WorkerPool, MaxBlockSize, MaxChunksPerBlock, MaxChunkEmbedSize, -- cgit v1.2.3