github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

update cri-plugin to parse hugepages limit from CRI message

Browse Source 
Signed-off-by: Byonggon Chun <bg.chun@samsung.com>
This commit is contained in:
Byonggon Chun 2019-11-04 14:34:05 +09:00
parent 99c6e0dd51
commit c02c24847f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/containerd/opts/spec_unix.go
View File

@ -423,10 +423,11 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts {
s.Linux.Resources.Memory = &runtimespec.LinuxMemory{} s.Linux.Resources.Memory = &runtimespec.LinuxMemory{}
} }
var ( var (
p = uint64(resources.GetCpuPeriod()) p = uint64(resources.GetCpuPeriod())
q = resources.GetCpuQuota() q = resources.GetCpuQuota()
shares = uint64(resources.GetCpuShares()) shares = uint64(resources.GetCpuShares())
limit = resources.GetMemoryLimitInBytes() limit = resources.GetMemoryLimitInBytes()
hugepages = resources.GetHugepageLimits()
) )
if p != 0 { if p != 0 {
@ -447,6 +448,12 @@ func WithResources(resources *runtime.LinuxContainerResources) oci.SpecOpts {
if limit != 0 { if limit != 0 {
s.Linux.Resources.Memory.Limit = &limit s.Linux.Resources.Memory.Limit = &limit
} }
for _, limit := range hugepages {
s.Linux.Resources.HugepageLimits = append(s.Linux.Resources.HugepageLimits, runtimespec.LinuxHugepageLimit{
Pagesize: limit.PageSize,
Limit: limit.Limit,
})
}
return nil return nil
} }
} }