vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #189 from docker/oom

Browse source 
Error oom if container has not stopped
This commit is contained in:
Michael Crosby 2016-04-07 10:46:35 -07:00
commit 389483d83f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
supervisor/worker.go
View file

@ -53,8 +53,10 @@ func (w *worker) Start() {
continue continue
} }
if err := w.s.monitor.MonitorOOM(t.Container); err != nil && err != runtime.ErrContainerExited { if err := w.s.monitor.MonitorOOM(t.Container); err != nil && err != runtime.ErrContainerExited {
if process.State() != runtime.Stopped {
logrus.WithField("error", err).Error("containerd: notify OOM events") logrus.WithField("error", err).Error("containerd: notify OOM events")
} }
}
if err := w.s.monitorProcess(process); err != nil { if err := w.s.monitorProcess(process); err != nil {
logrus.WithField("error", err).Error("containerd: add process to monitor") logrus.WithField("error", err).Error("containerd: add process to monitor")
} }