90f827ca10
* Sync process.State() with the matching events Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> * Allow requesting events for a specific container Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> * Sync container state retrieval with other events Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> * Let containerd take care of calling runtime delete on exit Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> * Take care of possible race in TestBusyboxTopExecTopKillInit Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
187 lines
4 KiB
Go
187 lines
4 KiB
Go
package main
|
|
|
|
import (
|
|
"path/filepath"
|
|
"syscall"
|
|
|
|
"github.com/docker/containerd/api/grpc/types"
|
|
"github.com/docker/docker/pkg/integration/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (cs *ContainerdSuite) TestBusyboxTopExecEcho(t *check.C) {
|
|
bundleName := "busybox-top"
|
|
if err := CreateBusyboxBundle(bundleName, []string{"top"}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
var (
|
|
err error
|
|
initp *ContainerProcess
|
|
echop *ContainerProcess
|
|
)
|
|
|
|
containerID := "top"
|
|
initp, err = cs.StartContainer(containerID, bundleName)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
echop, err = cs.AddProcessToContainer(initp, "echo", "/", []string{"PATH=/bin"}, []string{"sh", "-c", "echo -n Ay Caramba! ; exit 1"}, 0, 0)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
for _, evt := range []types.Event{
|
|
{
|
|
Type: "start-container",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: "",
|
|
},
|
|
{
|
|
Type: "start-process",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: "echo",
|
|
},
|
|
{
|
|
Type: "exit",
|
|
Id: containerID,
|
|
Status: 1,
|
|
Pid: "echo",
|
|
},
|
|
} {
|
|
ch := initp.GetEventsChannel()
|
|
e := <-ch
|
|
evt.Timestamp = e.Timestamp
|
|
|
|
t.Assert(*e, checker.Equals, evt)
|
|
}
|
|
|
|
t.Assert(echop.io.stdoutBuffer.String(), checker.Equals, "Ay Caramba!")
|
|
}
|
|
|
|
func (cs *ContainerdSuite) TestBusyboxTopExecTop(t *check.C) {
|
|
bundleName := "busybox-top"
|
|
if err := CreateBusyboxBundle(bundleName, []string{"top"}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
var (
|
|
err error
|
|
initp *ContainerProcess
|
|
)
|
|
|
|
containerID := "top"
|
|
initp, err = cs.StartContainer(containerID, bundleName)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
execID := "top1"
|
|
_, err = cs.AddProcessToContainer(initp, execID, "/", []string{"PATH=/usr/bin"}, []string{"top"}, 0, 0)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
for idx, evt := range []types.Event{
|
|
{
|
|
Type: "start-container",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: "",
|
|
},
|
|
{
|
|
Type: "start-process",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: execID,
|
|
},
|
|
{
|
|
Type: "exit",
|
|
Id: containerID,
|
|
Status: 137,
|
|
Pid: execID,
|
|
},
|
|
} {
|
|
ch := initp.GetEventsChannel()
|
|
e := <-ch
|
|
evt.Timestamp = e.Timestamp
|
|
t.Assert(*e, checker.Equals, evt)
|
|
if idx == 1 {
|
|
// Process Started, kill it
|
|
cs.SignalContainerProcess(containerID, "top1", uint32(syscall.SIGKILL))
|
|
}
|
|
}
|
|
|
|
// Container should still be running
|
|
containers, err := cs.ListRunningContainers()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Assert(len(containers), checker.Equals, 1)
|
|
t.Assert(containers[0].Id, checker.Equals, "top")
|
|
t.Assert(containers[0].Status, checker.Equals, "running")
|
|
t.Assert(containers[0].BundlePath, check.Equals, filepath.Join(cs.cwd, GetBundle(bundleName).Path))
|
|
}
|
|
|
|
func (cs *ContainerdSuite) TestBusyboxTopExecTopKillInit(t *check.C) {
|
|
bundleName := "busybox-top"
|
|
if err := CreateBusyboxBundle(bundleName, []string{"top"}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
var (
|
|
err error
|
|
initp *ContainerProcess
|
|
)
|
|
|
|
containerID := "top"
|
|
initp, err = cs.StartContainer(containerID, bundleName)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
execID := "top1"
|
|
_, err = cs.AddProcessToContainer(initp, execID, "/", []string{"PATH=/usr/bin"}, []string{"top"}, 0, 0)
|
|
t.Assert(err, checker.Equals, nil)
|
|
|
|
ch := initp.GetEventsChannel()
|
|
for _, evt := range []types.Event{
|
|
{
|
|
Type: "start-container",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: "",
|
|
},
|
|
{
|
|
Type: "start-process",
|
|
Id: containerID,
|
|
Status: 0,
|
|
Pid: execID,
|
|
},
|
|
} {
|
|
e := <-ch
|
|
evt.Timestamp = e.Timestamp
|
|
t.Assert(*e, checker.Equals, evt)
|
|
}
|
|
|
|
cs.SignalContainerProcess(containerID, "init", uint32(syscall.SIGTERM))
|
|
for i := 0; i < 2; i++ {
|
|
e := <-ch
|
|
switch e.Pid {
|
|
case "init":
|
|
evt := types.Event{
|
|
Type: "exit",
|
|
Id: containerID,
|
|
Status: 143,
|
|
Pid: "init",
|
|
Timestamp: e.Timestamp,
|
|
}
|
|
t.Assert(*e, checker.Equals, evt)
|
|
case execID:
|
|
evt := types.Event{
|
|
Type: "exit",
|
|
Id: containerID,
|
|
Status: 137,
|
|
Pid: execID,
|
|
Timestamp: e.Timestamp,
|
|
}
|
|
t.Assert(*e, checker.Equals, evt)
|
|
default:
|
|
t.Fatalf("Unexpected event %v", e)
|
|
}
|
|
}
|
|
|
|
}
|