github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1769 from stevvooe/split-events-types

Browse Source 
api/events: split event types from events service
This commit is contained in:
Derek McGowan
2017-11-16 16:29:28 -08:00
committed by GitHub
parent fc149f0ef9 09b5ca1072
commit 5c6e789dde
31 changed files with 1038 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/process.go
View File

@@ -5,7 +5,7 @@ package linux
import (
"context"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
shim "github.com/containerd/containerd/linux/shim/v1"
@@ -103,7 +103,7 @@ func (p *Process) Start(ctx context.Context) error {
if err != nil {
return errdefs.FromGRPC(err)
}
p.t.events.Publish(ctx, runtime.TaskExecStartedEventTopic, &eventsapi.TaskExecStarted{
p.t.events.Publish(ctx, runtime.TaskExecStartedEventTopic, &eventstypes.TaskExecStarted{
ContainerID: p.t.id,
Pid: r.Pid,
ExecID: p.id,

12
linux/runtime.go
View File

@@ -11,7 +11,7 @@ import (
"time"
"github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
@@ -286,11 +286,11 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
return nil, err
}
}
r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventsapi.TaskCreate{
r.events.Publish(ctx, runtime.TaskCreateEventTopic, &eventstypes.TaskCreate{
ContainerID: sopts.ID,
Bundle: sopts.Bundle,
Rootfs: sopts.Rootfs,
IO: &eventsapi.TaskIO{
IO: &eventstypes.TaskIO{
Stdin: sopts.Stdin,
Stdout: sopts.Stdout,
Stderr: sopts.Stderr,
@@ -337,7 +337,7 @@ func (r *Runtime) Delete(ctx context.Context, c runtime.Task) (*runtime.Exit, er
if err := bundle.Delete(); err != nil {
log.G(ctx).WithError(err).Error("failed to delete bundle")
}
r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventsapi.TaskDelete{
r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
ContainerID: lc.id,
ExitStatus: rsp.ExitStatus,
ExitedAt: rsp.ExitedAt,
@@ -452,7 +452,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
// Notify Client
exitedAt := time.Now().UTC()
r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventsapi.TaskExit{
r.events.Publish(ctx, runtime.TaskExitEventTopic, &eventstypes.TaskExit{
ContainerID: id,
ID: id,
Pid: uint32(pid),
@@ -464,7 +464,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
log.G(ctx).WithError(err).Error("delete bundle")
}
r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventsapi.TaskDelete{
r.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
ContainerID: id,
Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL),

24
linux/shim/service.go
View File

@@ -11,7 +11,7 @@ import (
"google.golang.org/grpc/codes"
"github.com/containerd/console"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
@@ -447,7 +447,7 @@ func (s *Service) checkProcesses(e runc.Exit) {
}
}
p.SetExited(e.Status)
s.events <- &eventsapi.TaskExit{
s.events <- &eventstypes.TaskExit{
ContainerID: s.id,
ID: p.ID(),
Pid: uint32(e.Pid),
@@ -488,25 +488,25 @@ func (s *Service) forward(publisher events.Publisher) {
func getTopic(ctx context.Context, e interface{}) string {
switch e.(type) {
case *eventsapi.TaskCreate:
case *eventstypes.TaskCreate:
return runtime.TaskCreateEventTopic
case *eventsapi.TaskStart:
case *eventstypes.TaskStart:
return runtime.TaskStartEventTopic
case *eventsapi.TaskOOM:
case *eventstypes.TaskOOM:
return runtime.TaskOOMEventTopic
case *eventsapi.TaskExit:
case *eventstypes.TaskExit:
return runtime.TaskExitEventTopic
case *eventsapi.TaskDelete:
case *eventstypes.TaskDelete:
return runtime.TaskDeleteEventTopic
case *eventsapi.TaskExecAdded:
case *eventstypes.TaskExecAdded:
return runtime.TaskExecAddedEventTopic
case *eventsapi.TaskExecStarted:
case *eventstypes.TaskExecStarted:
return runtime.TaskExecStartedEventTopic
case *eventsapi.TaskPaused:
case *eventstypes.TaskPaused:
return runtime.TaskPausedEventTopic
case *eventsapi.TaskResumed:
case *eventstypes.TaskResumed:
return runtime.TaskResumedEventTopic
case *eventsapi.TaskCheckpointed:
case *eventstypes.TaskCheckpointed:
return runtime.TaskCheckpointedEventTopic
default:
logrus.Warnf("no topic for type %#v", e)

10
linux/task.go
View File

@@ -9,7 +9,7 @@ import (
"google.golang.org/grpc"
"github.com/containerd/cgroups"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange"
@@ -90,7 +90,7 @@ func (t *Task) Start(ctx context.Context) error {
return err
}
}
t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventsapi.TaskStart{
t.events.Publish(ctx, runtime.TaskStartEventTopic, &eventstypes.TaskStart{
ContainerID: t.id,
Pid: uint32(t.pid),
})
@@ -138,7 +138,7 @@ func (t *Task) Pause(ctx context.Context) error {
if _, err := t.shim.Pause(ctx, empty); err != nil {
return errdefs.FromGRPC(err)
}
t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventsapi.TaskPaused{
t.events.Publish(ctx, runtime.TaskPausedEventTopic, &eventstypes.TaskPaused{
ContainerID: t.id,
})
return nil
@@ -149,7 +149,7 @@ func (t *Task) Resume(ctx context.Context) error {
if _, err := t.shim.Resume(ctx, empty); err != nil {
return errdefs.FromGRPC(err)
}
t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventsapi.TaskResumed{
t.events.Publish(ctx, runtime.TaskResumedEventTopic, &eventstypes.TaskResumed{
ContainerID: t.id,
})
return nil
@@ -243,7 +243,7 @@ func (t *Task) Checkpoint(ctx context.Context, path string, options *types.Any)
if _, err := t.shim.Checkpoint(ctx, r); err != nil {
return errdefs.FromGRPC(err)
}
t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventsapi.TaskCheckpointed{
t.events.Publish(ctx, runtime.TaskCheckpointedEventTopic, &eventstypes.TaskCheckpointed{
ContainerID: t.id,
})
return nil