diff options
| author | Dan Engelbrecht <[email protected]> | 2025-10-24 21:39:33 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-24 21:39:33 +0200 |
| commit | cb86c1f0bc1cf14f869820d56895671dffcb7f82 (patch) | |
| tree | dd9a2ee98e9d7f918d68b01652d1d19a39285104 | |
| parent | move cpr in-tree (#605) (diff) | |
| download | zen-cb86c1f0bc1cf14f869820d56895671dffcb7f82.tar.xz zen-cb86c1f0bc1cf14f869820d56895671dffcb7f82.zip | |
fix gc disk load graph (#610)
* make sure our gc disk load graph includes the latest measurement value
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenstore/gc.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3580f1ba4..bf6b52c5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Bugfix: If we can't run GC due to low disk space, skip GC and wait until next monitor interval to check again - Bugfix: Bumped vcpkg version to 2024.06.15 to work around issues during vcpkg install - Bugfix: Fixed progress reporting when scanning for changes in local folder state +- Bugfix: Make sure GC status disk load graph includes the latest measurement ## 5.7.6 - Improvement: Oidc token executable is now launched hidden when launch from inside zenserver (oplog import/export) diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp index b17103e43..c05cb5269 100644 --- a/src/zenstore/gc.cpp +++ b/src/zenstore/gc.cpp @@ -2300,7 +2300,7 @@ GcScheduler::SchedulerThread() uint64_t MaxLoad = 0; { - const GcClock::Tick EpochTickCount = GcClock::Now().time_since_epoch().count(); + const GcClock::Tick EpochTickCount = Now.time_since_epoch().count(); std::unique_lock Lock(m_GcMutex); if (AreDiskWritesAllowed()) { @@ -2310,8 +2310,8 @@ GcScheduler::SchedulerThread() const GcClock::TimePoint LoadGraphStartTime = Now - LoadGraphTime; const GcClock::Tick Start = LoadGraphStartTime.time_since_epoch().count(); const GcClock::Tick End = Now.time_since_epoch().count(); - DiskDeltas = m_DiskUsageWindow.GetDiskDeltas(Start, - End, + DiskDeltas = m_DiskUsageWindow.GetDiskDeltas(Start + 1, + End + 1, Max(1, (End - Start + PressureGraphLength - 1) / PressureGraphLength), MaxLoad); } |