Paweł Gronowski
99c1a9c778
A container that defines no stop timeout of its own always got 10 seconds on Linux, or 30 on Windows, to shut down before being killed. The value was a constant in the container package, so operators who wanted a different grace period had to pass `--stop-timeout` on every container. Add a `default-stop-timeout` daemon flag and configuration file option that supplies that fallback. Stopping a container, killing it, and computing the daemon shutdown timeout take the value from the daemon configuration when the container has no timeout of its own, so an explicit per-container timeout still wins and the container configuration itself stays untouched. The option can be reloaded, and negative values are rejected. mergo cannot tell an unset option from a zero value, so a configured timeout of `0`, meaning "kill immediately", would be replaced by the non-zero flag default while merging. Remember whether the configuration file set the option, and restore its value after the merge. `ContainerConfig.StopTimeout` in the API documentation no longer claims a fixed default of 10 seconds, because the fallback is now whatever `default-stop-timeout` holds. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
100 lines
2.1 KiB
Go
100 lines
2.1 KiB
Go
package container
|
|
|
|
import (
|
|
"path/filepath"
|
|
"syscall"
|
|
"testing"
|
|
|
|
"github.com/moby/moby/api/types/container"
|
|
"github.com/moby/moby/api/types/swarm"
|
|
"github.com/moby/moby/v2/daemon/logger/jsonfilelog"
|
|
"gotest.tools/v3/assert"
|
|
)
|
|
|
|
func TestContainerStopSignal(t *testing.T) {
|
|
c := &Container{
|
|
Config: &container.Config{},
|
|
}
|
|
|
|
s := c.StopSignal()
|
|
assert.Equal(t, s, defaultStopSignal)
|
|
|
|
c = &Container{
|
|
Config: &container.Config{StopSignal: "SIGKILL"},
|
|
}
|
|
s = c.StopSignal()
|
|
expected := syscall.SIGKILL
|
|
assert.Equal(t, s, expected)
|
|
|
|
c = &Container{
|
|
Config: &container.Config{StopSignal: "NOSUCHSIGNAL"},
|
|
}
|
|
s = c.StopSignal()
|
|
assert.Equal(t, s, defaultStopSignal)
|
|
}
|
|
|
|
func TestContainerSecretReferenceDestTarget(t *testing.T) {
|
|
ref := &swarm.SecretReference{
|
|
File: &swarm.SecretReferenceFileTarget{
|
|
Name: "app",
|
|
},
|
|
}
|
|
|
|
d := getSecretTargetPath(ref)
|
|
expected := filepath.Join(containerSecretMountPath, "app")
|
|
assert.Equal(t, d, expected)
|
|
}
|
|
|
|
func TestContainerLogPathSetForJSONFileLogger(t *testing.T) {
|
|
containerRoot := t.TempDir()
|
|
|
|
c := &Container{
|
|
Config: &container.Config{},
|
|
HostConfig: &container.HostConfig{
|
|
LogConfig: container.LogConfig{
|
|
Type: jsonfilelog.Name,
|
|
},
|
|
},
|
|
ID: t.Name(),
|
|
Root: containerRoot,
|
|
}
|
|
|
|
logger, err := c.StartLogger()
|
|
assert.NilError(t, err)
|
|
defer func() {
|
|
assert.NilError(t, logger.Close())
|
|
}()
|
|
|
|
expectedLogPath, err := filepath.Abs(filepath.Join(containerRoot, c.ID+"-json.log"))
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, c.LogPath, expectedLogPath)
|
|
}
|
|
|
|
func TestContainerLogPathSetForRingLogger(t *testing.T) {
|
|
containerRoot := t.TempDir()
|
|
|
|
c := &Container{
|
|
Config: &container.Config{},
|
|
HostConfig: &container.HostConfig{
|
|
LogConfig: container.LogConfig{
|
|
Type: jsonfilelog.Name,
|
|
Config: map[string]string{
|
|
"mode": string(container.LogModeNonBlock),
|
|
},
|
|
},
|
|
},
|
|
ID: t.Name(),
|
|
Root: containerRoot,
|
|
}
|
|
|
|
logger, err := c.StartLogger()
|
|
assert.NilError(t, err)
|
|
defer func() {
|
|
assert.NilError(t, logger.Close())
|
|
}()
|
|
|
|
expectedLogPath, err := filepath.Abs(filepath.Join(containerRoot, c.ID+"-json.log"))
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, c.LogPath, expectedLogPath)
|
|
}
|