diff options
Diffstat (limited to 'zenserver/upstream/hordecompute.cpp')
| -rw-r--r-- | zenserver/upstream/hordecompute.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/zenserver/upstream/hordecompute.cpp b/zenserver/upstream/hordecompute.cpp index 38c798569..22b06d9c4 100644 --- a/zenserver/upstream/hordecompute.cpp +++ b/zenserver/upstream/hordecompute.cpp @@ -17,7 +17,6 @@ # include <zencore/timer.h> # include <zencore/workthreadpool.h> -# include <zenstore/cas.h> # include <zenstore/cidstore.h> # include <auth/authmgr.h> @@ -49,11 +48,9 @@ namespace detail { const UpstreamAuthConfig& ComputeAuthConfig, const CloudCacheClientOptions& StorageOptions, const UpstreamAuthConfig& StorageAuthConfig, - CasStore& CasStore, CidStore& CidStore, AuthMgr& Mgr) : m_Log(logging::Get("upstream-apply")) - , m_CasStore(CasStore) , m_CidStore(CidStore) , m_AuthMgr(Mgr) { @@ -341,7 +338,7 @@ namespace detail { } else { - DataBuffer = m_CasStore.FindChunk(Hash); + DataBuffer = m_CidStore.FindChunkByCid(Hash); if (!DataBuffer) { Log().warn("Put blob FAILED, input chunk '{}' missing", Hash); @@ -676,7 +673,6 @@ namespace detail { spdlog::logger& Log() { return m_Log; } spdlog::logger& m_Log; - CasStore& m_CasStore; CidStore& m_CidStore; AuthMgr& m_AuthMgr; std::string m_DisplayName; @@ -1218,7 +1214,7 @@ namespace detail { const IoHash ChunkId = FileEntry["hash"sv].AsHash(); const uint64_t Size = FileEntry["size"sv].AsUInt64(); - if (!m_CasStore.ContainsChunk(ChunkId)) + if (!m_CidStore.ContainsChunk(ChunkId)) { Log().warn("process apply upstream FAILED, worker CAS chunk '{}' missing", ChunkId); return false; @@ -1443,7 +1439,6 @@ UpstreamApplyEndpoint::CreateHordeEndpoint(const CloudCacheClientOptions& Comput const UpstreamAuthConfig& ComputeAuthConfig, const CloudCacheClientOptions& StorageOptions, const UpstreamAuthConfig& StorageAuthConfig, - CasStore& CasStore, CidStore& CidStore, AuthMgr& Mgr) { @@ -1451,11 +1446,10 @@ UpstreamApplyEndpoint::CreateHordeEndpoint(const CloudCacheClientOptions& Comput ComputeAuthConfig, StorageOptions, StorageAuthConfig, - CasStore, CidStore, Mgr); } } // namespace zen -#endif // ZEN_WITH_COMPUTE_SERVICES
\ No newline at end of file +#endif // ZEN_WITH_COMPUTE_SERVICES |