github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90897 from tedyu/page-size-unit

Browse Source 
Append suffix 'i' only if needed
This commit is contained in:
Kubernetes Prow Robot 2020-05-11 08:37:51 -07:00 committed by GitHub
commit 15182dc418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/volume/emptydir/empty_dir_linux.go
View File

@ -69,7 +69,11 @@ func getPageSize(path string, mounter mount.Interface) (*resource.Quantity, erro
// NOTE: Adding suffix 'i' as result should be comparable with a medium size. // NOTE: Adding suffix 'i' as result should be comparable with a medium size.
// pagesize mount option is specified without a suffix, // pagesize mount option is specified without a suffix,
// e.g. pagesize=2M or pagesize=1024M for x86 CPUs // e.g. pagesize=2M or pagesize=1024M for x86 CPUs
pageSize, err := resource.ParseQuantity(strings.TrimPrefix(opt, prefix) + "i") trimmedOpt := strings.TrimPrefix(opt, prefix)
if !strings.HasSuffix(trimmedOpt, "i") {
trimmedOpt = trimmedOpt + "i"
}
pageSize, err := resource.ParseQuantity(trimmedOpt)
if err != nil { if err != nil {
return nil, fmt.Errorf("error getting page size from '%s' mount option: %v", opt, err) return nil, fmt.Errorf("error getting page size from '%s' mount option: %v", opt, err)
} }

6
pkg/volume/emptydir/empty_dir_test.go
View File

@ -836,6 +836,12 @@ func TestGetPageSize(t *testing.T) {
Path: "/mnt/hugepages-2Mi", Path: "/mnt/hugepages-2Mi",
Opts: []string{"rw", "relatime", "pagesize=2M"}, Opts: []string{"rw", "relatime", "pagesize=2M"},
}, },
{
Device: "/dev/hugepages",
Type: "hugetlbfs",
Path: "/mnt/hugepages-2Mi",
Opts: []string{"rw", "relatime", "pagesize=2Mi"},
},
{ {
Device: "sysfs", Device: "sysfs",
Type: "sysfs", Type: "sysfs",