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

Add oom event to monitors

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-04-13 15:18:43 -07:00
parent e745efdddb
commit eba88c1752
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linux/runtime.go
View File

@ -56,7 +56,7 @@ func New(ic *plugin.InitContext) (interface{}, error) {
cfg.Runtime = defaultRuntime cfg.Runtime = defaultRuntime
} }
c, cancel := context.WithCancel(ic.Context) c, cancel := context.WithCancel(ic.Context)
return &Runtime{ r := &Runtime{
root: path, root: path,
remote: !cfg.NoShim, remote: !cfg.NoShim,
runtime: cfg.Runtime, runtime: cfg.Runtime,
@ -64,7 +64,10 @@ func New(ic *plugin.InitContext) (interface{}, error) {
eventsContext: c, eventsContext: c,
eventsCancel: cancel, eventsCancel: cancel,
monitor: ic.Monitor, monitor: ic.Monitor,
}, nil }
// set the events output for a monitor if it generates events
ic.Monitor.Events(r.events)
return r, nil
} }
type Runtime struct { type Runtime struct {

17
metrics/cgroups/cgroups.go
View File

@ -1,6 +1,8 @@
package cgroups package cgroups
import ( import (
"time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/crosbymichael/cgroups" "github.com/crosbymichael/cgroups"
@ -39,6 +41,7 @@ type cgroupsMonitor struct {
collector *prometheus.Collector collector *prometheus.Collector
oom *prometheus.OOMCollector oom *prometheus.OOMCollector
context context.Context context context.Context
events chan<- *containerd.Event
} }
func (m *cgroupsMonitor) Monitor(c containerd.Container) error { func (m *cgroupsMonitor) Monitor(c containerd.Container) error {
@ -58,7 +61,7 @@ func (m *cgroupsMonitor) Monitor(c containerd.Container) error {
if err := m.collector.Add(id, cg); err != nil { if err := m.collector.Add(id, cg); err != nil {
return err return err
} }
return m.oom.Add(id, cg) return m.oom.Add(id, cg, m.trigger)
} }
func (m *cgroupsMonitor) Stop(c containerd.Container) error { func (m *cgroupsMonitor) Stop(c containerd.Container) error {
@ -68,3 +71,15 @@ func (m *cgroupsMonitor) Stop(c containerd.Container) error {
m.collector.Remove(c.Info().ID) m.collector.Remove(c.Info().ID)
return nil return nil
} }
func (m *cgroupsMonitor) Events(events chan<- *containerd.Event) {
m.events = events
}
func (m *cgroupsMonitor) trigger(id string, cg cgroups.Cgroup) {
m.events <- &containerd.Event{
Timestamp: time.Now(),
Type: containerd.OOMEvent,
ID: id,
}
}

11
plugin/monitor.go
View File

@ -8,6 +8,8 @@ type ContainerMonitor interface {
Monitor(containerd.Container) error Monitor(containerd.Container) error
// Stop stops and removes the provided container from the monitor // Stop stops and removes the provided container from the monitor
Stop(containerd.Container) error Stop(containerd.Container) error
// Events emits events from the monitor
Events(chan<- *containerd.Event)
} }
func NewMultiContainerMonitor(monitors ...ContainerMonitor) ContainerMonitor { func NewMultiContainerMonitor(monitors ...ContainerMonitor) ContainerMonitor {
@ -31,6 +33,9 @@ func (mm *noopContainerMonitor) Stop(c containerd.Container) error {
return nil return nil
} }
func (mm *noopContainerMonitor) Events(events chan<- *containerd.Event) {
}
type multiContainerMonitor struct { type multiContainerMonitor struct {
monitors []ContainerMonitor monitors []ContainerMonitor
} }
@ -52,3 +57,9 @@ func (mm *multiContainerMonitor) Stop(c containerd.Container) error {
} }
return nil return nil
} }
func (mm *multiContainerMonitor) Events(events chan<- *containerd.Event) {
for _, m := range mm.monitors {
m.Events(events)
}
}