diff options
| author | Dan Engelbrecht <[email protected]> | 2024-01-31 10:31:00 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-31 10:31:00 +0100 |
| commit | 78968c2e97a5c407a65088aa9861052d80498053 (patch) | |
| tree | 4fa02e7b9fd0b321b8ed7e4adaa7e06c6527929c /src/zenserver/projectstore/jupiterremoteprojectstore.cpp | |
| parent | Update README.md (diff) | |
| download | zen-78968c2e97a5c407a65088aa9861052d80498053.tar.xz zen-78968c2e97a5c407a65088aa9861052d80498053.zip | |
improve oplog export logging (#644)
- Improvement: More details in oplog import/export logs
- Improvement: Switch from Download to Get when fetching Refs from Jupiter as they can't be resumed anyway and streaming to disk is redundant
- Bugfix: Make sure we clear read callback when doing Put in HttpClient to avoid timeout due to not sending data when reusing sessions
- Bugfix: Respect `--ignore-missing-attachments` in `oplog-export` command when loose file is missing on disk
Diffstat (limited to 'src/zenserver/projectstore/jupiterremoteprojectstore.cpp')
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index c9f1f5f6f..418c2aa84 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -44,6 +44,8 @@ public: { return {.CreateBlocks = m_EnableBlocks, .UseTempBlockFiles = m_UseTempBlocks, + .ContainerName = fmt::format("{}/{}/{}", m_Namespace, m_Bucket, m_Key), + .BaseContainerName = m_OptionalBaseKey == IoHash::Zero ? "" : fmt::format("{}/{}/{}", m_Namespace, m_Bucket, m_Key), .Description = fmt::format("[cloud] {} as {}/{}/{}{}"sv, m_CloudClient->ServiceUrl(), m_Namespace, @@ -167,7 +169,7 @@ private: LoadContainerResult LoadContainer(const IoHash& Key) { CloudCacheSession Session(m_CloudClient.Get()); - CloudCacheResult GetResult = Session.GetRef(m_Namespace, m_Bucket, Key, ZenContentType::kCbObject, m_TempFilePath); + CloudCacheResult GetResult = Session.GetRef(m_Namespace, m_Bucket, Key, ZenContentType::kCbObject); if (GetResult.ErrorCode || !GetResult.Success) { LoadContainerResult Result{ConvertResult(GetResult)}; |