mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
9db5d649ae
the restart policy validation was moved from
the client to the daemon in 94e95e4711
As part of that change, retry-counts < 1
were marked as "invalid".
However, the default is 0 (unlimited), causing
docker run -d --restart=on-failure nginx
To fail.
This changes the validation to only invalidate
retry-counts < 0.
A test was added, and other tests renamed
to allow running just these tests :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
278 lines
9.1 KiB
Go
278 lines
9.1 KiB
Go
package main
|
|
|
|
import (
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/pkg/integration/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestRestartStoppedContainer(c *check.C) {
|
|
dockerCmd(c, "run", "--name=test", "busybox", "echo", "foobar")
|
|
cleanedContainerID, err := getIDByName("test")
|
|
c.Assert(err, check.IsNil)
|
|
|
|
out, _ := dockerCmd(c, "logs", cleanedContainerID)
|
|
c.Assert(out, checker.Equals, "foobar\n")
|
|
|
|
dockerCmd(c, "restart", cleanedContainerID)
|
|
|
|
// Wait until the container has stopped
|
|
err = waitInspect(cleanedContainerID, "{{.State.Running}}", "false", 20*time.Second)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
out, _ = dockerCmd(c, "logs", cleanedContainerID)
|
|
c.Assert(out, checker.Equals, "foobar\nfoobar\n")
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartRunningContainer(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo foobar && sleep 30 && echo 'should not print this'")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
c.Assert(waitRun(cleanedContainerID), checker.IsNil)
|
|
|
|
out, _ = dockerCmd(c, "logs", cleanedContainerID)
|
|
c.Assert(out, checker.Equals, "foobar\n")
|
|
|
|
dockerCmd(c, "restart", "-t", "1", cleanedContainerID)
|
|
|
|
out, _ = dockerCmd(c, "logs", cleanedContainerID)
|
|
|
|
c.Assert(waitRun(cleanedContainerID), checker.IsNil)
|
|
|
|
c.Assert(out, checker.Equals, "foobar\nfoobar\n")
|
|
}
|
|
|
|
// Test that restarting a container with a volume does not create a new volume on restart. Regression test for #819.
|
|
func (s *DockerSuite) TestRestartWithVolumes(c *check.C) {
|
|
prefix, slash := getPrefixAndSlashFromDaemonPlatform()
|
|
out, _ := runSleepingContainer(c, "-d", "-v", prefix+slash+"test")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
out, err := inspectFilter(cleanedContainerID, "len .Mounts")
|
|
c.Assert(err, check.IsNil, check.Commentf("failed to inspect %s: %s", cleanedContainerID, out))
|
|
out = strings.Trim(out, " \n\r")
|
|
c.Assert(out, checker.Equals, "1")
|
|
|
|
source, err := inspectMountSourceField(cleanedContainerID, prefix+slash+"test")
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
dockerCmd(c, "restart", cleanedContainerID)
|
|
|
|
out, err = inspectFilter(cleanedContainerID, "len .Mounts")
|
|
c.Assert(err, check.IsNil, check.Commentf("failed to inspect %s: %s", cleanedContainerID, out))
|
|
out = strings.Trim(out, " \n\r")
|
|
c.Assert(out, checker.Equals, "1")
|
|
|
|
sourceAfterRestart, err := inspectMountSourceField(cleanedContainerID, prefix+slash+"test")
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(source, checker.Equals, sourceAfterRestart)
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartPolicyNO(c *check.C) {
|
|
out, _ := dockerCmd(c, "create", "--restart=no", "busybox")
|
|
|
|
id := strings.TrimSpace(string(out))
|
|
name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
|
|
c.Assert(name, checker.Equals, "no")
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartPolicyAlways(c *check.C) {
|
|
out, _ := dockerCmd(c, "create", "--restart=always", "busybox")
|
|
|
|
id := strings.TrimSpace(string(out))
|
|
name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
|
|
c.Assert(name, checker.Equals, "always")
|
|
|
|
MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
|
|
|
|
// MaximumRetryCount=0 if the restart policy is always
|
|
c.Assert(MaximumRetryCount, checker.Equals, "0")
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartPolicyOnFailure(c *check.C) {
|
|
out, _, err := dockerCmdWithError("create", "--restart=on-failure:-1", "busybox")
|
|
c.Assert(err, check.NotNil, check.Commentf(out))
|
|
c.Assert(out, checker.Contains, "maximum retry count cannot be negative")
|
|
|
|
out, _ = dockerCmd(c, "create", "--restart=on-failure:1", "busybox")
|
|
|
|
id := strings.TrimSpace(string(out))
|
|
name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
|
|
maxRetry := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
|
|
|
|
c.Assert(name, checker.Equals, "on-failure")
|
|
c.Assert(maxRetry, checker.Equals, "1")
|
|
|
|
out, _ = dockerCmd(c, "create", "--restart=on-failure:0", "busybox")
|
|
|
|
id = strings.TrimSpace(string(out))
|
|
name = inspectField(c, id, "HostConfig.RestartPolicy.Name")
|
|
maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
|
|
|
|
c.Assert(name, checker.Equals, "on-failure")
|
|
c.Assert(maxRetry, checker.Equals, "0")
|
|
|
|
out, _ = dockerCmd(c, "create", "--restart=on-failure", "busybox")
|
|
|
|
id = strings.TrimSpace(string(out))
|
|
name = inspectField(c, id, "HostConfig.RestartPolicy.Name")
|
|
maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
|
|
|
|
c.Assert(name, checker.Equals, "on-failure")
|
|
c.Assert(maxRetry, checker.Equals, "0")
|
|
}
|
|
|
|
// a good container with --restart=on-failure:3
|
|
// MaximumRetryCount!=0; RestartCount=0
|
|
func (s *DockerSuite) TestRestartContainerwithGoodContainer(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "true")
|
|
|
|
id := strings.TrimSpace(string(out))
|
|
err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false false", 30*time.Second)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
count := inspectField(c, id, "RestartCount")
|
|
c.Assert(count, checker.Equals, "0")
|
|
|
|
MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
|
|
c.Assert(MaximumRetryCount, checker.Equals, "3")
|
|
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartContainerSuccess(c *check.C) {
|
|
testRequires(c, SameHostDaemon)
|
|
|
|
out, _ := runSleepingContainer(c, "-d", "--restart=always")
|
|
id := strings.TrimSpace(out)
|
|
c.Assert(waitRun(id), check.IsNil)
|
|
|
|
pidStr := inspectField(c, id, "State.Pid")
|
|
|
|
pid, err := strconv.Atoi(pidStr)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
p, err := os.FindProcess(pid)
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(p, check.NotNil)
|
|
|
|
err = p.Kill()
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)
|
|
c.Assert(err, check.IsNil)
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartWithPolicyUserDefinedNetwork(c *check.C) {
|
|
// TODO Windows. This may be portable following HNS integration post TP5.
|
|
testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace, NotArm)
|
|
dockerCmd(c, "network", "create", "-d", "bridge", "udNet")
|
|
|
|
dockerCmd(c, "run", "-d", "--net=udNet", "--name=first", "busybox", "top")
|
|
c.Assert(waitRun("first"), check.IsNil)
|
|
|
|
dockerCmd(c, "run", "-d", "--restart=always", "--net=udNet", "--name=second",
|
|
"--link=first:foo", "busybox", "top")
|
|
c.Assert(waitRun("second"), check.IsNil)
|
|
|
|
// ping to first and its alias foo must succeed
|
|
_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
|
|
c.Assert(err, check.IsNil)
|
|
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
|
|
c.Assert(err, check.IsNil)
|
|
|
|
// Now kill the second container and let the restart policy kick in
|
|
pidStr := inspectField(c, "second", "State.Pid")
|
|
|
|
pid, err := strconv.Atoi(pidStr)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
p, err := os.FindProcess(pid)
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(p, check.NotNil)
|
|
|
|
err = p.Kill()
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect("second", "{{.RestartCount}}", "1", 5*time.Second)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect("second", "{{.State.Status}}", "running", 5*time.Second)
|
|
|
|
// ping to first and its alias foo must still succeed
|
|
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
|
|
c.Assert(err, check.IsNil)
|
|
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
|
|
c.Assert(err, check.IsNil)
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartPolicyAfterRestart(c *check.C) {
|
|
testRequires(c, SameHostDaemon)
|
|
|
|
out, _ := runSleepingContainer(c, "-d", "--restart=always")
|
|
id := strings.TrimSpace(out)
|
|
c.Assert(waitRun(id), check.IsNil)
|
|
|
|
dockerCmd(c, "restart", id)
|
|
|
|
c.Assert(waitRun(id), check.IsNil)
|
|
|
|
pidStr := inspectField(c, id, "State.Pid")
|
|
|
|
pid, err := strconv.Atoi(pidStr)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
p, err := os.FindProcess(pid)
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(p, check.NotNil)
|
|
|
|
err = p.Kill()
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)
|
|
c.Assert(err, check.IsNil)
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) {
|
|
out1, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "false")
|
|
out2, _ := dockerCmd(c, "run", "-d", "--restart=always", "busybox", "false")
|
|
|
|
id1 := strings.TrimSpace(string(out1))
|
|
id2 := strings.TrimSpace(string(out2))
|
|
waitTimeout := 15 * time.Second
|
|
if daemonPlatform == "windows" {
|
|
waitTimeout = 150 * time.Second
|
|
}
|
|
err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
dockerCmd(c, "restart", id1)
|
|
dockerCmd(c, "restart", id2)
|
|
|
|
dockerCmd(c, "stop", id1)
|
|
dockerCmd(c, "stop", id2)
|
|
dockerCmd(c, "start", id1)
|
|
dockerCmd(c, "start", id2)
|
|
}
|
|
|
|
func (s *DockerSuite) TestRestartAutoRemoveContainer(c *check.C) {
|
|
out, _ := runSleepingContainer(c, "--rm")
|
|
|
|
id := strings.TrimSpace(string(out))
|
|
dockerCmd(c, "restart", id)
|
|
err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false true", 15*time.Second)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
out, _ = dockerCmd(c, "ps")
|
|
c.Assert(out, checker.Contains, id[:12], check.Commentf("container should be restarted instead of removed: %v", out))
|
|
}
|