jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #668 from mrunalp/fix_exec_oom 

Set oom_score_adj before we send the config to avoid race
This commit is contained in:
Mrunal Patel 2016-03-22 09:42:34 -07:00
parent 69f8a50081 69db69668e
commit a35f907983
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcontainer/process_linux.go
View File

@ -85,13 +85,13 @@ func (p *setnsProcess) start() (err error) {
return newSystemError(err)
}
}
if err := utils.WriteJSON(p.parentPipe, p.config); err != nil {
return newSystemError(err)
}
// set oom_score_adj
if err := setOomScoreAdj(p.config.Config.OomScoreAdj, p.pid()); err != nil {
return newSystemError(err)
}
if err := utils.WriteJSON(p.parentPipe, p.config); err != nil {
return newSystemError(err)
}
if err := syscall.Shutdown(int(p.parentPipe.Fd()), syscall.SHUT_WR); err != nil {
return newSystemError(err)