Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7e66ca58
Commit
7e66ca58
authored
Oct 28, 2017
by
xiangpengzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make HugePages const name consistent.
parent
afe40ae8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
empty_dir.go
pkg/volume/empty_dir/empty_dir.go
+2
-2
empty_dir_test.go
pkg/volume/empty_dir/empty_dir_test.go
+1
-1
types.go
staging/src/k8s.io/api/core/v1/types.go
+1
-1
No files found.
pkg/volume/empty_dir/empty_dir.go
View file @
7e66ca58
...
@@ -227,7 +227,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error {
...
@@ -227,7 +227,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error {
err
=
ed
.
setupDir
(
dir
)
err
=
ed
.
setupDir
(
dir
)
case
v1
.
StorageMediumMemory
:
case
v1
.
StorageMediumMemory
:
err
=
ed
.
setupTmpfs
(
dir
)
err
=
ed
.
setupTmpfs
(
dir
)
case
v1
.
StorageMediumHuge
p
ages
:
case
v1
.
StorageMediumHuge
P
ages
:
err
=
ed
.
setupHugepages
(
dir
)
err
=
ed
.
setupHugepages
(
dir
)
default
:
default
:
err
=
fmt
.
Errorf
(
"unknown storage medium %q"
,
ed
.
medium
)
err
=
fmt
.
Errorf
(
"unknown storage medium %q"
,
ed
.
medium
)
...
@@ -392,7 +392,7 @@ func (ed *emptyDir) TearDownAt(dir string) error {
...
@@ -392,7 +392,7 @@ func (ed *emptyDir) TearDownAt(dir string) error {
ed
.
medium
=
v1
.
StorageMediumMemory
ed
.
medium
=
v1
.
StorageMediumMemory
return
ed
.
teardownTmpfsOrHugetlbfs
(
dir
)
return
ed
.
teardownTmpfsOrHugetlbfs
(
dir
)
}
else
if
medium
==
mediumHugepages
{
}
else
if
medium
==
mediumHugepages
{
ed
.
medium
=
v1
.
StorageMediumHuge
p
ages
ed
.
medium
=
v1
.
StorageMediumHuge
P
ages
return
ed
.
teardownTmpfsOrHugetlbfs
(
dir
)
return
ed
.
teardownTmpfsOrHugetlbfs
(
dir
)
}
}
}
}
...
...
pkg/volume/empty_dir/empty_dir_test.go
View file @
7e66ca58
...
@@ -83,7 +83,7 @@ func TestPluginEmptyRootContext(t *testing.T) {
...
@@ -83,7 +83,7 @@ func TestPluginEmptyRootContext(t *testing.T) {
func
TestPluginHugetlbfs
(
t
*
testing
.
T
)
{
func
TestPluginHugetlbfs
(
t
*
testing
.
T
)
{
doTestPlugin
(
t
,
pluginTestConfig
{
doTestPlugin
(
t
,
pluginTestConfig
{
medium
:
v1
.
StorageMediumHuge
p
ages
,
medium
:
v1
.
StorageMediumHuge
P
ages
,
expectedSetupMounts
:
1
,
expectedSetupMounts
:
1
,
expectedTeardownMounts
:
0
,
expectedTeardownMounts
:
0
,
shouldBeMountedBeforeTeardown
:
true
,
shouldBeMountedBeforeTeardown
:
true
,
...
...
staging/src/k8s.io/api/core/v1/types.go
View file @
7e66ca58
...
@@ -989,7 +989,7 @@ type StorageMedium string
...
@@ -989,7 +989,7 @@ type StorageMedium string
const
(
const
(
StorageMediumDefault
StorageMedium
=
""
// use whatever the default is for the node
StorageMediumDefault
StorageMedium
=
""
// use whatever the default is for the node
StorageMediumMemory
StorageMedium
=
"Memory"
// use memory (tmpfs)
StorageMediumMemory
StorageMedium
=
"Memory"
// use memory (tmpfs)
StorageMediumHuge
p
ages
StorageMedium
=
"HugePages"
// use hugepages
StorageMediumHuge
P
ages
StorageMedium
=
"HugePages"
// use hugepages
)
)
// Protocol defines network protocols supported for things like container ports.
// Protocol defines network protocols supported for things like container ports.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment