netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Set gofer's OOM score adjustment

Browse Source 
Updates #512

PiperOrigin-RevId: 262195448
This commit is contained in:
Fabricio Voznika
2019-08-07 12:55:06 -07:00
committed by gVisor bot
parent 67a3f4039d
commit 79cc4397fd
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/container/container.go
+5 -19
View File
@@ -1176,30 +1176,16 @@ func (c *Container) adjustOOMScoreAdj(conf *boot.Config) error {
return nil
}
// Set oom_score_adj for the sandbox.
// Set the lowest of all containers oom_score_adj to the sandbox.
if err := setOOMScoreAdj(c.Sandbox.Pid, lowScore); err != nil {
return fmt.Errorf("setting oom_score_adj for sandbox %q: %v", c.Sandbox.ID, err)
}
// Set the gofer's oom_score_adj to the minimum of -500 and the
// sandbox's oom_score_adj to better ensure that the sandbox is killed
// before the gofer.
//
// TODO(gvisor.dev/issue/601) Set oom_score_adj for the gofer to
// the same oom_score_adj as the sandbox.
goferScoreAdj := -500
if lowScore < goferScoreAdj {
goferScoreAdj = lowScore
// Set container's oom_score_adj to the gofer since it is dedicated to the
// container, in case the gofer uses up too much memory.
if err := setOOMScoreAdj(c.GoferPid, *c.Spec.Process.OOMScoreAdj); err != nil {
return fmt.Errorf("setting gofer oom_score_adj for container %q: %v", c.ID, err)
}
// Set oom_score_adj for gofers for all containers in the sandbox.
for _, container := range containers {
err := setOOMScoreAdj(container.GoferPid, goferScoreAdj)
if err != nil {
return fmt.Errorf("setting oom_score_adj for container %q: %v", container.ID, err)
}
}
return nil
}