mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #3044 from dchen1107/oom_event
Understand OOMKilled reason from 'docker inspect'
This commit is contained in:
commit
4f1f8c02f4
@ -403,10 +403,18 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str
|
|||||||
}
|
}
|
||||||
waiting = false
|
waiting = false
|
||||||
} else if !inspectResult.State.FinishedAt.IsZero() {
|
} else if !inspectResult.State.FinishedAt.IsZero() {
|
||||||
// TODO(dchen1107): Integrate with event to provide a better reason
|
reason := ""
|
||||||
|
// Note: An application might handle OOMKilled gracefully.
|
||||||
|
// In that case, the container is oom killed, but the exit
|
||||||
|
// code could be 0.
|
||||||
|
if inspectResult.State.OOMKilled {
|
||||||
|
reason = "OOM Killed"
|
||||||
|
} else {
|
||||||
|
reason = inspectResult.State.Error
|
||||||
|
}
|
||||||
containerStatus.State.Termination = &api.ContainerStateTerminated{
|
containerStatus.State.Termination = &api.ContainerStateTerminated{
|
||||||
ExitCode: inspectResult.State.ExitCode,
|
ExitCode: inspectResult.State.ExitCode,
|
||||||
Reason: "",
|
Reason: reason,
|
||||||
StartedAt: util.NewTime(inspectResult.State.StartedAt),
|
StartedAt: util.NewTime(inspectResult.State.StartedAt),
|
||||||
FinishedAt: util.NewTime(inspectResult.State.FinishedAt),
|
FinishedAt: util.NewTime(inspectResult.State.FinishedAt),
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user