bc7f341f29
`Daemon.getPidContainer()` was wrapping the error-message with a message
("cannot join PID of a non running container") that did not reflect the
actual reason for the error; `Daemon.GetContainer()` could either return
an invalid parameter (invalid / empty identifier), or a "not found" error
if the specified container-ID could not be found.
In the latter case, we don't want to return a "not found" error through
the API, as this would indicate that the container we're _starting_ was
not found (which is not the case), so we need to convert the error into
an `errdefs.ErrInvalidParameter` (the container-ID specified for the PID
namespace is invalid if the container doesn't exist).
This logic is similar to what we do for IPC namespaces. which received
a similar fix in c3d7a0c603.
This patch updates the error-types, and moves them into the getIpcContainer
and getPidContainer container functions, both of which should return
an "invalid parameter" if the container was not found.
It's worth noting that, while `WithNamespaces()` may return an "invalid
parameter" error, the `start` endpoint itself may _not_ be. as outlined
in commit bf1fb97575, starting a container
that has an invalid configuration should be considered an internal server
error, and is not an invalid _request_. However, for uses other than
container "start", `WithNamespaces()` should return the correct error
to allow code to handle it accordingly.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
76 lines
2.9 KiB
Go
76 lines
2.9 KiB
Go
package container // import "github.com/docker/docker/integration/container"
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/errdefs"
|
|
"github.com/docker/docker/integration/internal/container"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/poll"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
func TestPIDModeHost(t *testing.T) {
|
|
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
|
|
skip.If(t, testEnv.IsRemoteDaemon())
|
|
|
|
hostPid, err := os.Readlink("/proc/1/ns/pid")
|
|
assert.NilError(t, err)
|
|
|
|
defer setupTest(t)()
|
|
apiClient := testEnv.APIClient()
|
|
ctx := context.Background()
|
|
|
|
cID := container.Run(ctx, t, apiClient, container.WithPIDMode("host"))
|
|
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "running"), poll.WithDelay(100*time.Millisecond))
|
|
cPid := container.GetContainerNS(ctx, t, apiClient, cID, "pid")
|
|
assert.Assert(t, hostPid == cPid)
|
|
|
|
cID = container.Run(ctx, t, apiClient)
|
|
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "running"), poll.WithDelay(100*time.Millisecond))
|
|
cPid = container.GetContainerNS(ctx, t, apiClient, cID, "pid")
|
|
assert.Assert(t, hostPid != cPid)
|
|
}
|
|
|
|
func TestPIDModeContainer(t *testing.T) {
|
|
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
|
|
|
|
defer setupTest(t)()
|
|
apiClient := testEnv.APIClient()
|
|
ctx := context.Background()
|
|
|
|
t.Run("non-existing container", func(t *testing.T) {
|
|
_, err := container.CreateFromConfig(ctx, apiClient, container.NewTestConfig(container.WithPIDMode("container:nosuchcontainer")))
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))
|
|
assert.Check(t, is.ErrorContains(err, "No such container: nosuchcontainer"))
|
|
})
|
|
|
|
t.Run("non-running container", func(t *testing.T) {
|
|
const pidCtrName = "stopped-pid-namespace-container"
|
|
cPIDContainerID := container.Create(ctx, t, apiClient, container.WithName(pidCtrName))
|
|
|
|
ctr, err := container.CreateFromConfig(ctx, apiClient, container.NewTestConfig(container.WithPIDMode("container:"+pidCtrName)))
|
|
assert.NilError(t, err, "should not produce an error when creating, only when starting")
|
|
|
|
err = apiClient.ContainerStart(ctx, ctr.ID, types.ContainerStartOptions{})
|
|
assert.Check(t, is.ErrorType(err, errdefs.IsSystem), "should produce a System error when starting an existing container from an invalid state")
|
|
assert.Check(t, is.ErrorContains(err, "failed to join PID namespace"))
|
|
assert.Check(t, is.ErrorContains(err, cPIDContainerID+" is not running"))
|
|
})
|
|
|
|
t.Run("running container", func(t *testing.T) {
|
|
const pidCtrName = "running-pid-namespace-container"
|
|
container.Run(ctx, t, apiClient, container.WithName(pidCtrName))
|
|
|
|
ctr, err := container.CreateFromConfig(ctx, apiClient, container.NewTestConfig(container.WithPIDMode("container:"+pidCtrName)))
|
|
assert.NilError(t, err)
|
|
|
|
err = apiClient.ContainerStart(ctx, ctr.ID, types.ContainerStartOptions{})
|
|
assert.Check(t, err)
|
|
})
|
|
}
|