Skip to content

docker-container: give readiness wait a full startup timeout #4050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazy-max wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −6
Open

docker-container: give readiness wait a full startup timeout #4050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions driver/docker-container/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,11 +573,10 @@ func clientWaitDeadline(state *container.State, now time.Time) (time.Time, error
if err != nil {
return time.Time{}, nil
}
deadline := startedAt.Add(buildkitdStartupTimeout)
if !now.Before(deadline) {
if !now.Before(startedAt.Add(buildkitdStartupTimeout)) {
return time.Time{}, nil
}
return deadline, nil
return now.Add(buildkitdStartupTimeout), nil
}

func (d *Driver) Factory() driver.Factory {
Expand Down
14 changes: 11 additions & 3 deletions driver/docker-container/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,21 @@ func TestClientWaitDeadline(t *testing.T) {
})

t.Run("recent-start-builder-waits", func(t *testing.T) {
startedAt := now.Add(-time.Second)
deadline, err := clientWaitDeadline(&container.State{
Running: true,
StartedAt: startedAt.Format(time.RFC3339Nano),
StartedAt: now.Add(-time.Second).Format(time.RFC3339Nano),
}, now)
require.NoError(t, err)
require.True(t, deadline.Equal(startedAt.Add(buildkitdStartupTimeout)))
require.True(t, deadline.Equal(now.Add(buildkitdStartupTimeout)))
})

t.Run("nearly-expired-startup-window-gets-full-wait", func(t *testing.T) {
deadline, err := clientWaitDeadline(&container.State{
Running: true,
StartedAt: now.Add(-buildkitdStartupTimeout + time.Nanosecond).Format(time.RFC3339Nano),
}, now)
require.NoError(t, err)
require.True(t, deadline.Equal(now.Add(buildkitdStartupTimeout)))
})

t.Run("invalid-start-time-skips-wait", func(t *testing.T) {
Expand Down
Loading