mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2025-12-23 22:57:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): fixed scheduling bug (#4732)

Browse Source 
This was a very stupid bug introduced in
https://github.com/kopia/kopia/pull/4682

Fixes #4729
This commit is contained in:
Jarek Kowalski
2025-07-21 17:51:29 -07:00
committed by GitHub
parent 3ae1c0e225
commit 0733cb4d2a
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/sleepable/sleepable_timer.go
View File

@@ -71,9 +71,8 @@ func NewTimer(nowFunc func() time.Time, until time.Time) *Timer {
return
case <-currentTimer.C:
// timer did trigger, close the channel to signal that sleepable.Timer.C is done
close(ch)
return
// timer did trigger, re-execute the loop to see if we reached the target time
continue
}
}
}()

29
internal/sleepable/sleepable_timer_test.go
View File

@@ -40,9 +40,9 @@ func TestNewTimer(t *testing.T) {
expected: 20 * time.Millisecond,
},
{
name: "long duration capped at maxSleepTime",
name: "long duration should wait full duration",
duration: 1 * time.Second,
expected: testMaxSleepTime,
expected: 1 * time.Second,
},
{
name: "exactly maxSleepTime",
@@ -76,14 +76,14 @@ func TestNewTimer(t *testing.T) {
return
}
if tt.duration <= testMaxSleepTime {
if elapsed < tt.duration-5*time.Millisecond || elapsed > tt.duration+50*time.Millisecond {
t.Errorf("timer triggered at wrong time: expected ~%v, got %v", tt.duration, elapsed)
}
} else {
if elapsed < testMaxSleepTime-5*time.Millisecond || elapsed > testMaxSleepTime+50*time.Millisecond {
t.Errorf("long timer triggered at wrong time: expected ~%v, got %v", testMaxSleepTime, elapsed)
}
// Allow some tolerance for timing variations
tolerance := 50 * time.Millisecond
if tt.duration < 100*time.Millisecond {
tolerance = 20 * time.Millisecond
}
if elapsed < tt.duration-tolerance || elapsed > tt.duration+tolerance {
t.Errorf("timer triggered at wrong time: expected ~%v, got %v", tt.duration, elapsed)
}
})
}
@@ -175,15 +175,16 @@ func TestTimerEdgeCases(t *testing.T) {
t.Run("very long duration", func(t *testing.T) {
start := clock.Now()
target := start.Add(24 * time.Hour)
target := start.Add(100 * time.Millisecond) // Use a shorter duration for testing
timer := NewTimer(clock.Now, target)
select {
case <-timer.C:
elapsed := clock.Now().Sub(start)
if elapsed < testMaxSleepTime-5*time.Millisecond || elapsed > testMaxSleepTime+50*time.Millisecond {
t.Errorf("very long timer triggered at wrong time: expected ~%v, got %v", testMaxSleepTime, elapsed)
// Allow tolerance for timing variations
if elapsed < 100*time.Millisecond-20*time.Millisecond || elapsed > 100*time.Millisecond+50*time.Millisecond {
t.Errorf("very long timer triggered at wrong time: expected ~%v, got %v", 100*time.Millisecond, elapsed)
}
case <-time.After(testMaxSleepTime + 100*time.Millisecond):
case <-time.After(200 * time.Millisecond):
t.Error("very long timer did not trigger within expected time")
}
})