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/zenhttp/servers/httpasio.cpp | 4 +++- src/zenhttp/servers/httpparser.cpp | 2 +- src/zenhttp/servers/httpplugin.cpp | 4 +++- src/zenhttp/servers/httpsys.cpp | 2 +- src/zenserver/projectstore/remoteprojectstore.cpp | 5 ++++- src/zenstore/gc.cpp | 22 ++++++++++++++++------ 6 files changed, 28 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp index c2a823430..fe59e3a6f 100644 --- a/src/zenhttp/servers/httpasio.cpp +++ b/src/zenhttp/servers/httpasio.cpp @@ -522,7 +522,9 @@ HttpServerConnection::HandleRequest() } else { - ZEN_ERROR("Caught system error exception while handling request: {}", SystemError.what()); + ZEN_ERROR("Caught system error exception while handling request: {}. ({})", + SystemError.what(), + SystemError.code().value()); Request.WriteResponse(HttpResponseCode::InternalServerError, HttpContentType::kText, SystemError.what()); } } diff --git a/src/zenhttp/servers/httpparser.cpp b/src/zenhttp/servers/httpparser.cpp index 6829faa4a..9bb354a5e 100644 --- a/src/zenhttp/servers/httpparser.cpp +++ b/src/zenhttp/servers/httpparser.cpp @@ -389,7 +389,7 @@ HttpRequestParser::OnMessageComplete() } else { - ZEN_ERROR("failed processing http request: '{}'", SystemError.what()); + ZEN_ERROR("failed processing http request: '{}' ({})", SystemError.what(), SystemError.code().value()); } ResetState(); return 1; diff --git a/src/zenhttp/servers/httpplugin.cpp b/src/zenhttp/servers/httpplugin.cpp index b55d80af8..ec12b3755 100644 --- a/src/zenhttp/servers/httpplugin.cpp +++ b/src/zenhttp/servers/httpplugin.cpp @@ -407,7 +407,9 @@ HttpPluginConnectionHandler::HandleRequest() } else { - ZEN_ERROR("Caught system error exception while handling request: {}", SystemError.what()); + ZEN_ERROR("Caught system error exception while handling request: {}. ({})", + SystemError.what(), + SystemError.code().value()); Request.WriteResponse(HttpResponseCode::InternalServerError, HttpContentType::kText, SystemError.what()); } } diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp index 54308a00b..bf7b8b7d7 100644 --- a/src/zenhttp/servers/httpsys.cpp +++ b/src/zenhttp/servers/httpsys.cpp @@ -2047,7 +2047,7 @@ InitialRequestHandler::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesT return new HttpMessageResponseRequest(Transaction(), (uint16_t)HttpResponseCode::InsufficientStorage, SystemError.what()); } - ZEN_ERROR("Caught system error exception while handling request: {}", SystemError.what()); + ZEN_ERROR("Caught system error exception while handling request: {}. ({})", SystemError.what(), SystemError.code().value()); return new HttpMessageResponseRequest(Transaction(), (uint16_t)HttpResponseCode::InternalServerError, SystemError.what()); } catch (const std::bad_alloc& BadAlloc) 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}; } diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp index 50588b8c0..7ac10d613 100644 --- a/src/zenstore/gc.cpp +++ b/src/zenstore/gc.cpp @@ -1810,7 +1810,7 @@ GcScheduler::AppendGCLog(std::string_view Id, GcClock::TimePoint StartTime, cons } else { - ZEN_ERROR("writing gc result failed with system error exception: '{}'", SystemError.what()); + ZEN_ERROR("writing gc result failed with system error exception: '{}' ({})", SystemError.what(), SystemError.code().value()); } } catch (const std::bad_alloc& BadAlloc) @@ -2274,7 +2274,9 @@ GcScheduler::SchedulerThread() } else { - ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}'", SystemError.what()); + ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}' ({})", + SystemError.what(), + SystemError.code().value()); } m_LastGcTime = GcClock::Now(); m_LastLightweightGcTime = m_LastGcTime; @@ -2596,11 +2598,15 @@ GcScheduler::CollectGarbage(const GcClock::TimePoint& CacheExpireTime, } if (RetryCount == 0) { - ZEN_ERROR("writing gc scheduler state failed with system error exception: '{}'", SystemError.what()); + ZEN_ERROR("writing gc scheduler state failed with system error exception: '{}' ({})", + SystemError.what(), + SystemError.code().value()); } else { - ZEN_WARN("writing gc scheduler state failed with system error exception: '{}'", SystemError.what()); + ZEN_WARN("writing gc scheduler state failed with system error exception: '{}' ({})", + SystemError.what(), + SystemError.code().value()); } } catch (const std::bad_alloc& BadAlloc) @@ -2636,11 +2642,15 @@ GcScheduler::CollectGarbage(const GcClock::TimePoint& CacheExpireTime, { if (SilenceErrors) { - ZEN_WARN("scheduling garbage collection failed with system error exception: '{}'", SystemError.what()); + ZEN_WARN("scheduling garbage collection failed with system error exception: '{}' ({})", + SystemError.what(), + SystemError.code().value()); } else { - ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}'", SystemError.what()); + ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}' ({})", + SystemError.what(), + SystemError.code().value()); } } m_LastGcTime = GcClock::Now(); -- cgit v1.2.3