github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6030 from liubin/fix/6029-use-system-hugepagesize

Browse Source 
runtime: use system pagesize for hugepage test
This commit is contained in:
Tim Zhang 2023-01-16 16:57:55 +08:00 committed by GitHub
commit 20196048bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime/virtcontainers/kata_agent_linux_test.go
View File

@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"os" "os"
"path" "path"
"runtime"
"strings" "strings"
"syscall" "syscall"
"testing" "testing"
@ -34,17 +33,12 @@ func TestHandleHugepages(t *testing.T) {
var mounts []specs.Mount var mounts []specs.Mount
var hugepageLimits []specs.LinuxHugepageLimit var hugepageLimits []specs.LinuxHugepageLimit
// On s390x, hugepage sizes must be set at boot and cannot be created ad hoc. Use any that // Hugepage sizes must be set at boot time and cannot be created ad hoc.
// are present (default is 1M, can only be changed on LPAR). See // Use any that are present.
// https://www.ibm.com/docs/en/linuxonibm/pdf/lku5dd05.pdf, p. 345 for more information. dirs, err := os.ReadDir(sysHugepagesDir)
if runtime.GOARCH == "s390x" { assert.Nil(err)
dirs, err := os.ReadDir(sysHugepagesDir) for _, dir := range dirs {
assert.Nil(err) formattedSizes = append(formattedSizes, strings.TrimPrefix(dir.Name(), "hugepages-"))
for _, dir := range dirs {
formattedSizes = append(formattedSizes, strings.TrimPrefix(dir.Name(), "hugepages-"))
}
} else {
formattedSizes = []string{"1G", "2M"}
} }
for _, formattedSize := range formattedSizes { for _, formattedSize := range formattedSizes {