aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-29 03:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

CCv0: Merge main into CCv0 branch

Browse Source 
Merge in snap fix

Signed-off-by: Megan Wright <megan.wright@ibm.com>
This commit is contained in:
Megan Wright
2022-06-16 10:46:27 +01:00
parent 94695869b0 f30fe86dc1
commit eeff63375f
186 changed files with 5760 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1119,7 +1119,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).
annotation, ok := spec.Annotations[ctrAnnotations.SandboxCPUPeriod]
if ok {
period, err = strconv.ParseUint(annotation, 10, 32)
period, err = strconv.ParseUint(annotation, 10, 64)
if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUPeriod: %s", annotation)
period = 0
@@ -1128,7 +1128,7 @@ func CalculateSandboxSizing(spec *specs.Spec) (numCPU, memSizeMB uint32) {
annotation, ok = spec.Annotations[ctrAnnotations.SandboxCPUQuota]
if ok {
quota, err = strconv.ParseInt(annotation, 10, 32)
quota, err = strconv.ParseInt(annotation, 10, 64)
if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxCPUQuota: %s", annotation)
quota = 0
@@ -1137,7 +1137,7 @@ func CalculateSandboxSizing(spec *specs.Spec) (numCPU, memSizeMB uint32) {
annotation, ok = spec.Annotations[ctrAnnotations.SandboxMem]
if ok {
memory, err = strconv.ParseInt(annotation, 10, 32)
memory, err = strconv.ParseInt(annotation, 10, 64)
if err != nil {
ociLog.Warningf("sandbox-sizing: failure to parse SandboxMem: %s", annotation)
memory = 0

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

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