diff options
| author | Dan Engelbrecht <[email protected]> | 2025-10-03 12:38:35 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-03 12:38:35 +0200 |
| commit | 5361ee1c77b68bb14237169660840d6d63a74892 (patch) | |
| tree | 3ad259133e09485a14506be38e43ec5b62a050f2 /src/zenserver | |
| parent | move chunking code to zenremotestore lib (#545) (diff) | |
| download | zen-5361ee1c77b68bb14237169660840d6d63a74892.tar.xz zen-5361ee1c77b68bb14237169660840d6d63a74892.zip | |
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
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/cache/httpstructuredcache.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/projectstore/httpprojectstore.cpp | 24 | ||||
| -rw-r--r-- | src/zenserver/upstream/upstreamcache.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver/zenserver.cpp | 2 |
4 files changed, 26 insertions, 8 deletions
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp index a9d6be8f2..884684eed 100644 --- a/src/zenserver/cache/httpstructuredcache.cpp +++ b/src/zenserver/cache/httpstructuredcache.cpp @@ -12,6 +12,7 @@ #include <zencore/fmtutils.h> #include <zencore/logging.h> #include <zencore/memory/llm.h> +#include <zencore/parallelwork.h> #include <zencore/scopeguard.h> #include <zencore/stream.h> #include <zencore/timer.h> @@ -20,13 +21,12 @@ #include <zenhttp/httpserver.h> #include <zenhttp/httpstats.h> #include <zenhttp/packageformat.h> +#include <zenremotestore/jupiter/jupiterclient.h> #include <zenstore/cache/structuredcachestore.h> #include <zenstore/gc.h> #include <zenutil/cache/cache.h> #include <zenutil/cache/cacherequests.h> #include <zenutil/cache/rpcrecording.h> -#include <zenutil/jupiter/jupiterclient.h> -#include <zenutil/parallelwork.h> #include <zenutil/workerpools.h> #include "upstream/upstreamcache.h" 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, diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp index 744b861dd..8558e2a10 100644 --- a/src/zenserver/upstream/upstreamcache.cpp +++ b/src/zenserver/upstream/upstreamcache.cpp @@ -20,8 +20,8 @@ #include <zenstore/cache/structuredcachestore.h> #include <zenstore/cidstore.h> -#include <zenutil/jupiter/jupiterclient.h> -#include <zenutil/jupiter/jupitersession.h> +#include <zenremotestore/jupiter/jupiterclient.h> +#include <zenremotestore/jupiter/jupitersession.h> #include "cache/httpstructuredcache.h" #include "diag/logging.h" diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 6ef78a7a4..c1199c1a7 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -22,11 +22,11 @@ #include <zencore/trace.h> #include <zencore/workthreadpool.h> #include <zenhttp/httpserver.h> +#include <zenremotestore/jupiter/jupiterclient.h> #include <zenstore/buildstore/buildstore.h> #include <zenstore/cidstore.h> #include <zenstore/scrubcontext.h> #include <zenstore/workspaces.h> -#include <zenutil/jupiter/jupiterclient.h> #include <zenutil/workerpools.h> #include <zenutil/zenserverprocess.h> |