Merge pull request #189 from docker/oom
Error oom if container has not stopped
This commit is contained in:
commit
389483d83f
1 changed files with 3 additions and 1 deletions
|
@ -53,7 +53,9 @@ func (w *worker) Start() {
|
|||
continue
|
||||
}
|
||||
if err := w.s.monitor.MonitorOOM(t.Container); err != nil && err != runtime.ErrContainerExited {
|
||||
logrus.WithField("error", err).Error("containerd: notify OOM events")
|
||||
if process.State() != runtime.Stopped {
|
||||
logrus.WithField("error", err).Error("containerd: notify OOM events")
|
||||
}
|
||||
}
|
||||
if err := w.s.monitorProcess(process); err != nil {
|
||||
logrus.WithField("error", err).Error("containerd: add process to monitor")
|
||||
|
|
Loading…
Reference in a new issue