Skip to content

K
k3s
Commit b05d8ad1 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52338 from PiotrProkop/fix-hugepages

Automatic merge from submit-queue (batch tested with PRs 51041, 52297, 52296, 52335, 52338) Fix pagesize mount option name **What this PR does / why we need it**: Fixes #52337 .
parents 36b43013 8465f96d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
pkg/volume/empty_dir/empty_dir.go
View file @ b05d8ad1
...@@ -54,7 +54,8 @@ type emptyDirPlugin struct { ...@@ -54,7 +54,8 @@ type emptyDirPlugin struct {
var _ volume.VolumePlugin = &emptyDirPlugin{} var _ volume.VolumePlugin = &emptyDirPlugin{}
const ( const (
emptyDirPluginName = "kubernetes.io/empty-dir" emptyDirPluginName = "kubernetes.io/empty-dir"
hugePagesPageSizeMountOption = "pagesize"
) )
func getPath(uid types.UID, volName string, host volume.VolumeHost) string { func getPath(uid types.UID, volName string, host volume.VolumeHost) string {
...@@ -321,7 +322,7 @@ func getPageSizeMountOptionFromPod(pod *v1.Pod) (string, error) { ...@@ -321,7 +322,7 @@ func getPageSizeMountOptionFromPod(pod *v1.Pod) (string, error) {
return "", fmt.Errorf("hugePages storage requested, but there is no resource request for huge pages.") return "", fmt.Errorf("hugePages storage requested, but there is no resource request for huge pages.")
} }
return fmt.Sprintf("pageSize=%s", pageSize.String()), nil return fmt.Sprintf("%s=%s", hugePagesPageSizeMountOption, pageSize.String()), nil
} }
......
pkg/volume/empty_dir/empty_dir_test.go
View file @ b05d8ad1
...@@ -323,7 +323,7 @@ func TestGetHugePagesMountOptions(t *testing.T) { ...@@ -323,7 +323,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
}, },
}, },
shouldFail: false, shouldFail: false,
expectedResult: "pageSize=2Mi", expectedResult: "pagesize=2Mi",
}, },
"testWithProperValuesAndDifferentPageSize": { "testWithProperValuesAndDifferentPageSize": {
pod: &v1.Pod{ pod: &v1.Pod{
...@@ -347,7 +347,7 @@ func TestGetHugePagesMountOptions(t *testing.T) { ...@@ -347,7 +347,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
}, },
}, },
shouldFail: false, shouldFail: false,
expectedResult: "pageSize=1Gi", expectedResult: "pagesize=1Gi",
}, },
"InitContainerAndContainerHasProperValues": { "InitContainerAndContainerHasProperValues": {
pod: &v1.Pod{ pod: &v1.Pod{
...@@ -371,7 +371,7 @@ func TestGetHugePagesMountOptions(t *testing.T) { ...@@ -371,7 +371,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
}, },
}, },
shouldFail: false, shouldFail: false,
expectedResult: "pageSize=1Gi", expectedResult: "pagesize=1Gi",
}, },
"InitContainerAndContainerHasDifferentPageSizes": { "InitContainerAndContainerHasDifferentPageSizes": {
pod: &v1.Pod{ pod: &v1.Pod{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment