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

Merge pull request #7809 from mikebrow/check-deep-copies-on-restart

Browse Source 
nil check to avoid panic on upgrade
This commit is contained in:
Maksym Pavlenko 2022-12-13 22:22:20 -08:00 committed by GitHub
commit 371e27ffb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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