mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #9246 from estesp/add-oom-event
Proposal: Add "OOM killed" event based on OOM state information
This commit is contained in:
commit
8722b6db4b
3 changed files with 8 additions and 2 deletions
|
@ -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:
|
||||
|
||||
|
|
Loading…
Reference in a new issue