From d7dbc855ab2bd2ccf86f809b463bda3ba38d64ce Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Mon, 13 Jan 2025 12:51:12 +0100 Subject: Suppress progress report callback if oplog import detects zero op oplog (#271) * Suppress progress report callback if oplog import detects oplog with zero ops * output error code when catching system errors --- src/zenserver/projectstore/remoteprojectstore.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/zenserver/projectstore/remoteprojectstore.cpp') diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp index 216b1c4dd..df77deab8 100644 --- a/src/zenserver/projectstore/remoteprojectstore.cpp +++ b/src/zenserver/projectstore/remoteprojectstore.cpp @@ -266,7 +266,10 @@ namespace remotestore_impl { AppendBatch(); } - ReportProgress(OptionalContext, "Writing oplog"sv, ""sv, OpCount, 0); + if (OpCount > 0) + { + ReportProgress(OptionalContext, "Writing oplog"sv, ""sv, OpCount, 0); + } return RemoteProjectStore::Result{.ElapsedSeconds = Timer.GetElapsedTimeMs() / 1000.0}; } -- cgit v1.2.3 From 06612946b7ef6d82bb08afd0782e5cacb9fda0fd Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Thu, 16 Jan 2025 09:19:38 +0100 Subject: export oplog to zen target url (#274) * fix oplog target url for oplog export to remote zenserver * verify that chunking is allowed before chunking loose files --- src/zenserver/projectstore/remoteprojectstore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/zenserver/projectstore/remoteprojectstore.cpp') diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp index df77deab8..0589fdc5f 100644 --- a/src/zenserver/projectstore/remoteprojectstore.cpp +++ b/src/zenserver/projectstore/remoteprojectstore.cpp @@ -1688,7 +1688,7 @@ BuildContainer(CidStore& ChunkStore, IoBuffer RawData = IoBufferBuilder::MakeFromFile(FilePath); if (RawData) { - if (RawData.GetSize() > ChunkFileSizeLimit) + if (AllowChunking && RawData.GetSize() > ChunkFileSizeLimit) { IoBufferFileReference FileRef; (void)RawData.GetFileReference(FileRef); -- cgit v1.2.3