github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-02 13:44:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime: fix error when trying to parse sandbox sizing annotations

Browse Source 
Changed bitsize for parsing functions to 64-bit in order to avoid
parsing errors.

Fixes #4435

Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
This commit is contained in:
Alexandru Matei 2022-06-08 12:46:32 +03:00
parent 5bd81ba232
commit 721ca72a64
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/pkg/oci/utils.go
View File

@ -1114,7 +1114,7 @@ func CalculateSandboxSizing(spec *specs.Spec) (numCPU, memSizeMB uint32) {
// ... to result in VM resources of 1 (MB) for memory, and 3 for CPU (2200 mCPU rounded up to 3). // ... to result in VM resources of 1 (MB) for memory, and 3 for CPU (2200 mCPU rounded up to 3).
annotation, ok := spec.Annotations[ctrAnnotations.SandboxCPUPeriod] annotation, ok := spec.Annotations[ctrAnnotations.SandboxCPUPeriod]
if ok { if ok {
period, err = strconv.ParseUint(annotation, 10, 32) period, err = strconv.ParseUint(annotation, 10, 64)
if err != nil { if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUPeriod: %s", annotation) ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUPeriod: %s", annotation)
period = 0 period = 0
@ -1123,7 +1123,7 @@ func CalculateSandboxSizing(spec *specs.Spec) (numCPU, memSizeMB uint32) {
annotation, ok = spec.Annotations[ctrAnnotations.SandboxCPUQuota] annotation, ok = spec.Annotations[ctrAnnotations.SandboxCPUQuota]
if ok { if ok {
quota, err = strconv.ParseInt(annotation, 10, 32) quota, err = strconv.ParseInt(annotation, 10, 64)
if err != nil { if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUQuota: %s", annotation) ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUQuota: %s", annotation)
quota = 0 quota = 0
@ -1132,7 +1132,7 @@ func CalculateSandboxSizing(spec *specs.Spec) (numCPU, memSizeMB uint32) {
annotation, ok = spec.Annotations[ctrAnnotations.SandboxMem] annotation, ok = spec.Annotations[ctrAnnotations.SandboxMem]
if ok { if ok {
memory, err = strconv.ParseInt(annotation, 10, 32) memory, err = strconv.ParseInt(annotation, 10, 64)
if err != nil { if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxMem: %s", annotation) ociLog.Warningf("sandbox-sizing: failure to parse SandboxMem: %s", annotation)
memory = 0 memory = 0

5
src/runtime/pkg/oci/utils_test.go
View File

@ -1196,6 +1196,11 @@ func TestCalculateSandboxSizing(t *testing.T) {
expectedCPU: 100, expectedCPU: 100,
expectedMem: 0, expectedMem: 0,
}, },
{
spec: makeSizingAnnotations("4294967296", "400", "100"),
expectedCPU: 4,
expectedMem: 4096,
},
} }
for _, tt := range testCases { for _, tt := range testCases {