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
37f9e130
Commit
37f9e130
authored
Jun 09, 2017
by
Xing Zhou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless error
parent
d026286d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
14 deletions
+4
-14
helpers.go
pkg/api/v1/resource/helpers.go
+1
-1
helpers_linux.go
pkg/kubelet/cm/helpers_linux.go
+1
-4
qos_container_manager_linux.go
pkg/kubelet/cm/qos_container_manager_linux.go
+2
-9
No files found.
pkg/api/v1/resource/helpers.go
View file @
37f9e130
...
@@ -27,7 +27,7 @@ import (
...
@@ -27,7 +27,7 @@ import (
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all
// containers of the pod.
// containers of the pod.
func
PodRequestsAndLimits
(
pod
*
v1
.
Pod
)
(
reqs
map
[
v1
.
ResourceName
]
resource
.
Quantity
,
limits
map
[
v1
.
ResourceName
]
resource
.
Quantity
,
err
error
)
{
func
PodRequestsAndLimits
(
pod
*
v1
.
Pod
)
(
reqs
map
[
v1
.
ResourceName
]
resource
.
Quantity
,
limits
map
[
v1
.
ResourceName
]
resource
.
Quantity
)
{
reqs
,
limits
=
map
[
v1
.
ResourceName
]
resource
.
Quantity
{},
map
[
v1
.
ResourceName
]
resource
.
Quantity
{}
reqs
,
limits
=
map
[
v1
.
ResourceName
]
resource
.
Quantity
{},
map
[
v1
.
ResourceName
]
resource
.
Quantity
{}
for
_
,
container
:=
range
pod
.
Spec
.
Containers
{
for
_
,
container
:=
range
pod
.
Spec
.
Containers
{
for
name
,
quantity
:=
range
container
.
Resources
.
Requests
{
for
name
,
quantity
:=
range
container
.
Resources
.
Requests
{
...
...
pkg/kubelet/cm/helpers_linux.go
View file @
37f9e130
...
@@ -86,10 +86,7 @@ func MilliCPUToShares(milliCPU int64) int64 {
...
@@ -86,10 +86,7 @@ func MilliCPUToShares(milliCPU int64) int64 {
// ResourceConfigForPod takes the input pod and outputs the cgroup resource config.
// ResourceConfigForPod takes the input pod and outputs the cgroup resource config.
func
ResourceConfigForPod
(
pod
*
v1
.
Pod
)
*
ResourceConfig
{
func
ResourceConfigForPod
(
pod
*
v1
.
Pod
)
*
ResourceConfig
{
// sum requests and limits.
// sum requests and limits.
reqs
,
limits
,
err
:=
resource
.
PodRequestsAndLimits
(
pod
)
reqs
,
limits
:=
resource
.
PodRequestsAndLimits
(
pod
)
if
err
!=
nil
{
return
&
ResourceConfig
{}
}
cpuRequests
:=
int64
(
0
)
cpuRequests
:=
int64
(
0
)
cpuLimits
:=
int64
(
0
)
cpuLimits
:=
int64
(
0
)
...
...
pkg/kubelet/cm/qos_container_manager_linux.go
View file @
37f9e130
...
@@ -148,10 +148,7 @@ func (m *qosContainerManagerImpl) setCPUCgroupConfig(configs map[v1.PodQOSClass]
...
@@ -148,10 +148,7 @@ func (m *qosContainerManagerImpl) setCPUCgroupConfig(configs map[v1.PodQOSClass]
// we only care about the burstable qos tier
// we only care about the burstable qos tier
continue
continue
}
}
req
,
_
,
err
:=
resource
.
PodRequestsAndLimits
(
pod
)
req
,
_
:=
resource
.
PodRequestsAndLimits
(
pod
)
if
err
!=
nil
{
return
err
}
if
request
,
found
:=
req
[
v1
.
ResourceCPU
];
found
{
if
request
,
found
:=
req
[
v1
.
ResourceCPU
];
found
{
burstablePodCPURequest
+=
request
.
MilliValue
()
burstablePodCPURequest
+=
request
.
MilliValue
()
}
}
...
@@ -188,11 +185,7 @@ func (m *qosContainerManagerImpl) setMemoryReserve(configs map[v1.PodQOSClass]*C
...
@@ -188,11 +185,7 @@ func (m *qosContainerManagerImpl) setMemoryReserve(configs map[v1.PodQOSClass]*C
// limits are not set for Best Effort pods
// limits are not set for Best Effort pods
continue
continue
}
}
req
,
_
,
err
:=
resource
.
PodRequestsAndLimits
(
pod
)
req
,
_
:=
resource
.
PodRequestsAndLimits
(
pod
)
if
err
!=
nil
{
glog
.
V
(
2
)
.
Infof
(
"[Container Manager] Pod resource requests/limits could not be determined. Not setting QOS memory limts."
)
return
}
if
request
,
found
:=
req
[
v1
.
ResourceMemory
];
found
{
if
request
,
found
:=
req
[
v1
.
ResourceMemory
];
found
{
podMemoryRequest
+=
request
.
Value
()
podMemoryRequest
+=
request
.
Value
()
}
}
...
...
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