mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-03-13 03:36:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): fixed TestFullMaintenance on Windows (#2325)

Browse Source 
Unlike on other OSes it appears that on Windows time.Now() called twice
in quick succession can return the same value.

Switched logic using `time.After()` to `!time.Before()`
This commit is contained in:
Jarek Kowalski
2022-08-19 08:01:34 -07:00
committed by GitHub
parent e317cdba9f
commit cf23809dcd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repo/maintenance/maintenance_run.go
View File

@@ -61,7 +61,7 @@ func shouldRun(ctx context.Context, rep repo.DirectRepository, p *Params) (Mode,
// check full cycle first, as it does more than the quick cycle
if p.FullCycle.Enabled {
if rep.Time().After(s.NextFullMaintenanceTime) {
if !rep.Time().Before(s.NextFullMaintenanceTime) {
log(ctx).Debugf("due for full maintenance cycle")
return ModeFull, nil
}
@@ -73,7 +73,7 @@ func shouldRun(ctx context.Context, rep repo.DirectRepository, p *Params) (Mode,
// no time for full cycle, check quick cycle
if p.QuickCycle.Enabled {
if rep.Time().After(s.NextQuickMaintenanceTime) {
if !rep.Time().Before(s.NextQuickMaintenanceTime) {
log(ctx).Debugf("due for quick maintenance cycle")
return ModeQuick, nil
}
@@ -454,7 +454,7 @@ func shouldQuickRewriteContents(s *Schedule, safety SafetyParameters) bool {
return true
}
return latestBlobDeleteTime.After(latestContentRewriteEndTime)
return !latestBlobDeleteTime.Before(latestContentRewriteEndTime)
}
// shouldFullRewriteContents returns true if it's currently ok to rewrite contents.
@@ -471,7 +471,7 @@ func shouldFullRewriteContents(s *Schedule, safety SafetyParameters) bool {
return true
}
return latestBlobDeleteTime.After(latestContentRewriteEndTime)
return !latestBlobDeleteTime.Before(latestContentRewriteEndTime)
}
// shouldDeleteOrphanedPacks returns true if it's ok to delete orphaned packs.
@@ -480,7 +480,7 @@ func shouldFullRewriteContents(s *Schedule, safety SafetyParameters) bool {
// rewritten packs become orphaned immediately but if we don't wait before their deletion
// clients who have old indexes cached may be trying to read pre-rewrite blobs.
func shouldDeleteOrphanedPacks(now time.Time, s *Schedule, safety SafetyParameters) bool {
return now.After(nextBlobDeleteTime(s, safety))
return !now.Before(nextBlobDeleteTime(s, safety))
}
func nextBlobDeleteTime(s *Schedule, safety SafetyParameters) time.Time {
@@ -493,7 +493,7 @@ func nextBlobDeleteTime(s *Schedule, safety SafetyParameters) time.Time {
}
func hadRecentFullRewrite(s *Schedule) bool {
return maxEndTime(s.Runs[TaskRewriteContentsFull]).After(maxEndTime(s.Runs[TaskRewriteContentsQuick]))
return !maxEndTime(s.Runs[TaskRewriteContentsFull]).Before(maxEndTime(s.Runs[TaskRewriteContentsQuick]))
}
func maxEndTime(taskRuns ...[]RunInfo) time.Time {