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

Merge pull request #1116 from rajasec/hugetlb-panic 

Fixing runc panic during hugetlb pages
This commit is contained in:
Qiang Huang 2016-10-17 13:55:59 +08:00 committed by GitHub
parent 7be6edaa60 4b263c9594
commit a6284a7bdb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcontainer/specconv/spec_linux.go
View File

@ -438,6 +438,9 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
} }
} }
for _, l := range r.HugepageLimits { for _, l := range r.HugepageLimits {
if l.Pagesize == nil || l.Limit == nil {
return nil, fmt.Errorf("pagesize and limit can not be empty")
}
c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{ c.Resources.HugetlbLimit = append(c.Resources.HugetlbLimit, &configs.HugepageLimit{
Pagesize: *l.Pagesize, Pagesize: *l.Pagesize,
Limit: *l.Limit, Limit: *l.Limit,