featrue: 当容器异常退出时，上报容器是否被OOM信息 TencentBlueKing#397

zmberg · Mar 5, 2020 · 0b175ce · 0b175ce
1 parent 5b8b22d
commit 0b175ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/bcs-mesos/bcs-container-executor/container/container.go b/bcs-mesos/bcs-container-executor/container/container.go
@@ -56,6 +56,7 @@ type BcsContainerInfo struct {
 	Message                 string                 `json:"Message,omitempty"`     //status message for container
 	Resource                *schedTypes.Resource   `json:"Resource,omitempty"`
 	BcsMessage              *schedTypes.BcsMessage `json:",omitempty"`
+	OOMKilled               bool                   `json:"OOMKilled,omitempty"` //container exited, whether oom
 }
 
 //Update data from other info
@@ -73,6 +74,7 @@ func (info *BcsContainerInfo) Update(other *BcsContainerInfo) {
 	info.Hostname = other.Hostname
 	info.IsChecked = other.IsChecked
 	info.ConsecutiveFailureTimes = other.ConsecutiveFailureTimes
+	info.OOMKilled = other.OOMKilled
 	if strings.Contains(other.NetworkMode, "container:") {
 		info.NetworkMode = "user"
 	} else {

diff --git a/bcs-mesos/bcs-container-executor/container/docker.go b/bcs-mesos/bcs-container-executor/container/docker.go
@@ -501,6 +501,7 @@ func (docker *DockerContainer) InspectContainer(containerName string) (*BcsConta
 		ExitCode:    container.State.ExitCode,
 		Hostname:    container.Config.Hostname,
 		NetworkMode: container.HostConfig.NetworkMode,
+		OOMKilled:   container.State.OOMKilled,
 		Resource: &schedTypes.Resource{
 			Cpus: float64(container.HostConfig.CPUShares / 1024),
 			Mem:  float64(container.HostConfig.Memory / 1024 / 1024),