github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6201 from dmcgowan/test-restart-monitor-check-timestamp

Browse Source 
Update TestRestartMonitor expected time check
This commit is contained in:
Phil Estes 2021-12-02 15:30:27 -05:00 committed by GitHub
commit 08812f3fb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
integration/client/restart_monitor_test.go
View File

@ -156,13 +156,21 @@ version = 2
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer func() {
if err := container.Delete(ctx, WithSnapshotCleanup); err != nil {
t.Logf("failed to delete container: %v", err)
}
}()
task, err := container.NewTask(ctx, empty()) task, err := container.NewTask(ctx, empty())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer task.Delete(ctx, WithProcessKill) defer func() {
if _, err := task.Delete(ctx, WithProcessKill); err != nil {
t.Logf("failed to delete task: %v", err)
}
}()
if err := task.Start(ctx); err != nil { if err := task.Start(ctx); err != nil {
t.Fatal(err) t.Fatal(err)
@ -173,10 +181,9 @@ version = 2
} }
begin := time.Now() begin := time.Now()
lastCheck := begin
// The restart is "truly" expected after (interval + epsilon), but due to some flakiness in CI, we give it a bit extra time. expected := begin.Add(interval).Add(epsilon)
// Specifically, we give an extra "grace period" of (count / 2) seconds.
expected := begin.Add(interval).Add(epsilon * (count / 2))
// Deadline determines when check for restart should be aborted. // Deadline determines when check for restart should be aborted.
deadline := begin.Add(interval).Add(epsilon * count) deadline := begin.Add(interval).Add(epsilon * count)
@ -188,24 +195,27 @@ version = 2
// temporarily removes the task before restarting. // temporarily removes the task before restarting.
t.Logf("%v: err=%v", now, err) t.Logf("%v: err=%v", now, err)
} else { } else {
t.Logf("%v: status=%q", now, status) t.Logf("%v: status=%q", now, status.Status)
if status.Status == Running { if status.Status == Running {
break break
} }
} }
if time.Now().After(deadline) {
t.Logf("%v: the task was not restarted", now) // lastCheck represents the last time the status was seen as not running
lastCheck = now
if lastCheck.After(deadline) {
t.Logf("%v: the task was not restarted", lastCheck)
return return
} }
time.Sleep(epsilon) time.Sleep(epsilon)
} }
now := time.Now() // Use the last timestamp for when the process was seen as not running for the check
if now.After(expected) { if lastCheck.After(expected) {
t.Fatalf("%v: the task was restarted, but it must be before %v", now, expected) t.Fatalf("%v: the task was restarted, but it must be before %v", lastCheck, expected)
} }
t.Logf("%v: the task was restarted before %v", now, expected) t.Logf("%v: the task was restarted since %v", time.Now(), lastCheck)
} }
// withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus. // withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus.