aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2025-11-24 10:02:16 +0100
committerGitHub Enterprise <[email protected]>2025-11-24 10:02:16 +0100
commit7871637ced8f9310acea9a0ce941714fdee6be0b (patch)
tree7363ea4f764dfe5ca5e88cbcb0abc3a4ef764e35
parentGetSystemMetrics for Mac,Linux (#660) (diff)
downloadzen-7871637ced8f9310acea9a0ce941714fdee6be0b.tar.xz
zen-7871637ced8f9310acea9a0ce941714fdee6be0b.zip
changelog (#661)
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zenremotestore/projectstore/remoteprojectstore.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3b41b52b..ffaa66ae6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
##
- Bugfix: Block store GC would write the wrong chunk data for chunks larger than 256KB
- Bugfix: Remove read-only flags for files copied as part of a full service install operation
+- Bugfix: If oplog container save fails the error code is no propagated out as a return code for the command
## 5.7.11
- Improvement: Drop-all action added to dashboard for projects and z$ namespaces
diff --git a/src/zenremotestore/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp
index a928d1644..f42856252 100644
--- a/src/zenremotestore/projectstore/remoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp
@@ -2543,7 +2543,7 @@ SaveOplog(CidStore& ChunkStore,
{
RemoteResult.SetError(ContainerSaveResult.ErrorCode, ContainerSaveResult.Reason, "Failed to save oplog container");
RemoteProjectStore::Result Result = {
- .ErrorCode = 0,
+ .ErrorCode = RemoteResult.GetError(),
.ElapsedSeconds = Timer.GetElapsedTimeMs() / 1000.0,
.Text = fmt::format("Failed to save oplog container ({}): {}", RemoteResult.GetError(), RemoteResult.GetErrorReason())};
remotestore_impl::ReportMessage(