Add "OOM killed" event based on OOM state information

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
This commit is contained in:
Phil Estes 2014-11-19 14:50:16 -05:00
Родитель 8412e3c226
Коммит 44cab4a4ff
3 изменённых файлов: 8 добавлений и 2 удалений
daemon
docs/sources/reference

Просмотреть файл

@ -154,6 +154,9 @@ func (m *containerMonitor) Start() error {
if m.shouldRestart(exitStatus.ExitCode) {
m.container.SetRestarting(&exitStatus)
if exitStatus.OOMKilled {
m.container.LogEvent("oom")
}
m.container.LogEvent("die")
m.resetContainer(true)
@ -170,6 +173,9 @@ func (m *containerMonitor) Start() error {
continue
}
m.container.ExitCode = exitStatus.ExitCode
if exitStatus.OOMKilled {
m.container.LogEvent("oom")
}
m.container.LogEvent("die")
m.resetContainer(true)
return err

Просмотреть файл

@ -1375,7 +1375,7 @@ polling (using since).
Docker containers will report the following events:
create, destroy, die, export, kill, pause, restart, start, stop, unpause
create, destroy, die, export, kill, oom, pause, restart, start, stop, unpause
and Docker images will report:

Просмотреть файл

@ -761,7 +761,7 @@ For example:
Docker containers will report the following events:
create, destroy, die, export, kill, pause, restart, start, stop, unpause
create, destroy, die, export, kill, oom, pause, restart, start, stop, unpause
and Docker images will report: