Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions pkg/driver/docker/lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,11 @@ func (d *dockerDriver) restartAndWait(
"restarting container %s (status=%s, attempt=%d/%d)",
container.ID, status, attempt, containerRestartAttempts,
)
if err := d.Docker.StartContainer(ctx, container.ID); err != nil {
lastErr = fmt.Errorf("start container: %w", err)
} else if err := d.Docker.WaitContainerRunning(ctx, container.ID); err != nil {
lastErr = fmt.Errorf("wait for container to be running: %w", err)
} else {
if lastErr = d.startAndWait(ctx, container.ID); lastErr == nil {
log.Debugf("container %s is running", container.ID)
return nil
}
if errors.Is(lastErr, docker.ErrContainerTerminal) ||
errors.Is(lastErr, context.Canceled) ||
errors.Is(lastErr, context.DeadlineExceeded) {
if isTerminalOrContextError(lastErr) {
return lastErr
}
log.Debugf("container %s restart attempt %d failed: %v", container.ID, attempt, lastErr)
Expand All @@ -125,6 +119,22 @@ func (d *dockerDriver) restartAndWait(
)
}

func (d *dockerDriver) startAndWait(ctx context.Context, containerID string) error {
if err := d.Docker.StartContainer(ctx, containerID); err != nil {
return fmt.Errorf("start container: %w", err)
}
if err := d.Docker.WaitContainerRunning(ctx, containerID); err != nil {
return fmt.Errorf("wait for container to be running: %w", err)
}
return nil
}

func isTerminalOrContextError(err error) bool {
return errors.Is(err, docker.ErrContainerTerminal) ||
errors.Is(err, context.Canceled) ||
errors.Is(err, context.DeadlineExceeded)
}

// unpauseAndWait unpauses a paused container and waits for it to be running.
func (d *dockerDriver) unpauseAndWait(
ctx context.Context,
Expand Down
84 changes: 84 additions & 0 deletions pkg/driver/docker/lifecycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package docker

import (
"context"
"fmt"
"os"
"path/filepath"
"strconv"
Expand Down Expand Up @@ -453,3 +454,86 @@ func TestEnsureContainerRunning_UnknownStateIsTerminal(t *testing.T) {
require.Error(t, err)
assert.ErrorIs(t, err, docker.ErrContainerTerminal)
}

func TestRestartAndWait_ContextCanceledExitsEarly(t *testing.T) {
dir := t.TempDir()
startsFile := filepath.Join(dir, "starts")
script := `#!/bin/sh
case "$1" in
start)
echo 1 >> "` + startsFile + `"
echo started
;;
inspect)
echo '[{"ID":"c1","State":{"Status":"exited","ExitCode":1}}]'
;;
esac
`
bin := filepath.Join(dir, "docker-fake")
require.NoError(t, os.WriteFile(bin, []byte(script), 0o755)) //nolint:gosec

d := &dockerDriver{Docker: &docker.DockerHelper{DockerCommand: bin}}
ctx, cancel := context.WithCancel(context.Background())
cancel() // canceled immediately

err := d.restartAndWait(
ctx,
newExitedContainer(),
config.ContainerStatusExited,
)
require.Error(t, err)
assert.ErrorIs(t, err, context.Canceled)

// Ensure loop did not make start attempts
_, readErr := os.ReadFile(startsFile) //nolint:gosec // test-controlled path
assert.True(t, os.IsNotExist(readErr), "canceled context must abort before attempting restart")
}

func TestRestartAndWait_TerminalErrorExitsEarlyWithoutRetrying(t *testing.T) {
dir := t.TempDir()
startsFile := filepath.Join(dir, "starts")
script := `#!/bin/sh
case "$1" in
start)
echo 1 >> "` + startsFile + `"
echo started
;;
inspect)
echo '[{"ID":"c1","State":{"Status":"dead","ExitCode":1}}]'
;;
esac
`
bin := filepath.Join(dir, "docker-fake")
require.NoError(t, os.WriteFile(bin, []byte(script), 0o755)) //nolint:gosec

d := &dockerDriver{Docker: &docker.DockerHelper{DockerCommand: bin}}
err := d.restartAndWait(
context.Background(),
newExitedContainer(),
config.ContainerStatusExited,
)
require.Error(t, err)
assert.ErrorIs(t, err, docker.ErrContainerTerminal)

// Should abort on attempt 1, so startsFile should have exactly 1 attempt
startsData, readErr := os.ReadFile(startsFile) //nolint:gosec // test-controlled path
require.NoError(t, readErr)
lines := string(startsData)
assert.Equal(
t,
"1\n",
lines,
"terminal state must abort immediately without continuing attempts",
)
}

func TestIsTerminalOrContextError(t *testing.T) {
assert.False(t, isTerminalOrContextError(nil))
assert.False(t, isTerminalOrContextError(assert.AnError))
assert.True(t, isTerminalOrContextError(docker.ErrContainerTerminal))
assert.True(t, isTerminalOrContextError(context.Canceled))
assert.True(t, isTerminalOrContextError(context.DeadlineExceeded))
assert.True(t, isTerminalOrContextError(fmt.Errorf("wrapped: %w", docker.ErrContainerTerminal)))
assert.True(t, isTerminalOrContextError(fmt.Errorf("wrapped: %w", context.Canceled)))
assert.True(t, isTerminalOrContextError(fmt.Errorf("wrapped: %w", context.DeadlineExceeded)))
}
Loading