kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #9246 from estesp/add-oom-event

Browse source 
Proposal: Add "OOM killed" event based on OOM state information
This commit is contained in:
James Turnbull 2014-12-26 22:54:02 -05:00
commit 8722b6db4b
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/monitor.go
View file

@ -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

2
docs/sources/reference/api/docker_remote_api_v1.17.md
View file

@ -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:

2
docs/sources/reference/commandline/cli.md
View file

@ -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: