-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure containers are stopped on daemon startup
When the containerd 1.0 runtime changes were made, we inadvertantly removed the functionality where any running containers are killed on startup when not using live-restore. This change restores that behavior. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
- Loading branch information
Showing
2 changed files
with
135 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
package container | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"testing" | ||
"time" | ||
|
||
"github.com/docker/docker/api/types" | ||
"github.com/docker/docker/api/types/container" | ||
"github.com/docker/docker/integration-cli/daemon" | ||
) | ||
|
||
func TestDaemonRestartKillContainers(t *testing.T) { | ||
type testCase struct { | ||
desc string | ||
config *container.Config | ||
hostConfig *container.HostConfig | ||
|
||
xRunning bool | ||
xRunningLiveRestore bool | ||
} | ||
|
||
for _, c := range []testCase{ | ||
{ | ||
desc: "container without restart policy", | ||
config: &container.Config{Image: "busybox", Cmd: []string{"top"}}, | ||
xRunningLiveRestore: true, | ||
}, | ||
{ | ||
desc: "container with restart=always", | ||
config: &container.Config{Image: "busybox", Cmd: []string{"top"}}, | ||
hostConfig: &container.HostConfig{RestartPolicy: container.RestartPolicy{Name: "always"}}, | ||
xRunning: true, | ||
xRunningLiveRestore: true, | ||
}, | ||
} { | ||
for _, liveRestoreEnabled := range []bool{false, true} { | ||
for fnName, stopDaemon := range map[string]func(*testing.T, *daemon.Daemon){ | ||
"kill-daemon": func(t *testing.T, d *daemon.Daemon) { | ||
if err := d.Kill(); err != nil { | ||
t.Fatal(err) | ||
} | ||
}, | ||
"stop-daemon": func(t *testing.T, d *daemon.Daemon) { | ||
d.Stop(t) | ||
}, | ||
} { | ||
t.Run(fmt.Sprintf("live-restore=%v/%s/%s", liveRestoreEnabled, c.desc, fnName), func(t *testing.T) { | ||
c := c | ||
liveRestoreEnabled := liveRestoreEnabled | ||
stopDaemon := stopDaemon | ||
|
||
t.Parallel() | ||
|
||
d := daemon.New(t, "", "dockerd", daemon.Config{}) | ||
client, err := d.NewClient() | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
var args []string | ||
if liveRestoreEnabled { | ||
args = []string{"--live-restore"} | ||
} | ||
|
||
d.StartWithBusybox(t, args...) | ||
defer d.Stop(t) | ||
ctx := context.Background() | ||
|
||
resp, err := client.ContainerCreate(ctx, c.config, c.hostConfig, nil, "") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true}) | ||
|
||
if err := client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
stopDaemon(t, d) | ||
d.Start(t, args...) | ||
|
||
expected := c.xRunning | ||
if liveRestoreEnabled { | ||
expected = c.xRunningLiveRestore | ||
} | ||
|
||
var running bool | ||
for i := 0; i < 30; i++ { | ||
inspect, err := client.ContainerInspect(ctx, resp.ID) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
running = inspect.State.Running | ||
if running == expected { | ||
break | ||
} | ||
time.Sleep(2 * time.Second) | ||
|
||
} | ||
|
||
if running != expected { | ||
t.Fatalf("got unexpected running state, expected %v, got: %v", expected, running) | ||
} | ||
// TODO(cpuguy83): test pause states... this seems to be rather undefined currently | ||
}) | ||
} | ||
} | ||
} | ||
} |