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

Merge pull request #7661 from liubin/fix-vec-alloc

Browse Source 
Fix slice append error (`spec.Linux.Resources.HugepageLimits`)
This commit is contained in:
Phil Estes 2022-11-11 12:32:29 -05:00 committed by GitHub
commit 135af6d9ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/helpers.go
View File

@ -474,7 +474,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
} }
if spec.Linux.Resources.HugepageLimits != nil { if spec.Linux.Resources.HugepageLimits != nil {
hugepageLimits := make([]*runtime.HugepageLimit, len(spec.Linux.Resources.HugepageLimits)) hugepageLimits := make([]*runtime.HugepageLimit, 0)
for _, l := range spec.Linux.Resources.HugepageLimits { for _, l := range spec.Linux.Resources.HugepageLimits {
hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{ hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
PageSize: l.Pagesize, PageSize: l.Pagesize,

2
pkg/cri/store/container/status.go
View File

@ -219,7 +219,7 @@ func deepCopyOf(s Status) Status {
} }
copy.Resources = &runtime.ContainerResources{} copy.Resources = &runtime.ContainerResources{}
if s.Resources != nil && s.Resources.Linux != nil { if s.Resources != nil && s.Resources.Linux != nil {
hugepageLimits := make([]*runtime.HugepageLimit, len(s.Resources.Linux.HugepageLimits)) hugepageLimits := make([]*runtime.HugepageLimit, 0)
for _, l := range s.Resources.Linux.HugepageLimits { for _, l := range s.Resources.Linux.HugepageLimits {
hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{ hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
PageSize: l.PageSize, PageSize: l.PageSize,