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

Merge pull request #5861 from kzys/restart-monitor

Browse Source 
integration: investigate TestRestartMonitor's failure
This commit is contained in:
Michael Crosby 2021-09-09 10:56:40 -04:00 committed by GitHub
commit d040ca3845
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
integration/client/restart_monitor_linux_test.go
View File

@ -34,6 +34,7 @@ func TestRestartMonitor(t *testing.T) {
const ( const (
interval = 10 * time.Second interval = 10 * time.Second
epsilon = 1 * time.Second epsilon = 1 * time.Second
count = 20
) )
configTOML := fmt.Sprintf(` configTOML := fmt.Sprintf(`
version = 2 version = 2
@ -78,9 +79,14 @@ version = 2
t.Fatal(err) t.Fatal(err)
} }
task.Kill(ctx, syscall.SIGKILL) if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
t.Fatal(err)
}
begin := time.Now() begin := time.Now()
deadline := begin.Add(interval).Add(epsilon)
expected := begin.Add(interval).Add(epsilon)
deadline := begin.Add(interval).Add(epsilon * count)
for { for {
status, err := task.Status(ctx) status, err := task.Status(ctx)
now := time.Now() now := time.Now()
@ -92,18 +98,21 @@ version = 2
t.Logf("%v: status=%q", now, status) t.Logf("%v: status=%q", now, status)
if status.Status == Running { if status.Status == Running {
elapsed := time.Since(begin) break
t.Logf("the task was restarted within %s", elapsed.String())
return
} }
} }
if time.Now().After(deadline) { if time.Now().After(deadline) {
break t.Logf("%v: the task was not restarted", now)
return
} }
time.Sleep(epsilon) time.Sleep(epsilon)
} }
t.Fatalf("%v: the task was not restarted in %s + %s",
time.Now(), interval.String(), epsilon.String()) now := time.Now()
if now.After(expected) {
t.Fatalf("%v: the task was restarted, but it must be before %v", now, expected)
}
t.Logf("%v: the task was restarted before %v", now, expected)
} }
// withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus. // withRestartStatus is a copy of "github.com/containerd/containerd/runtime/restart".WithStatus.