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
f82accda
Commit
f82accda
authored
Jun 16, 2015
by
Saad Ali
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9582 from mnagy/fix_quoting
Quote integers correctly
parents
d18dcabc
ff2b5b78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
container_manager_linux.go
pkg/kubelet/container_manager_linux.go
+3
-3
No files found.
pkg/kubelet/container_manager_linux.go
View file @
f82accda
...
...
@@ -185,19 +185,19 @@ func ensureDockerInContainer(oomScoreAdj int, manager *fs.Manager) error {
for
_
,
pid
:=
range
pids
{
cont
,
err
:=
getContainer
(
pid
)
if
err
!=
nil
{
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to find container of PID %
q
: %v"
,
pid
,
err
))
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to find container of PID %
d
: %v"
,
pid
,
err
))
}
if
cont
!=
manager
.
Cgroups
.
Name
{
err
=
manager
.
Apply
(
pid
)
if
err
!=
nil
{
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to move PID %
q
(in %q) to %q"
,
pid
,
cont
,
manager
.
Cgroups
.
Name
))
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to move PID %
d
(in %q) to %q"
,
pid
,
cont
,
manager
.
Cgroups
.
Name
))
}
}
// Also apply oom_score_adj to processes
if
err
:=
util
.
ApplyOomScoreAdj
(
pid
,
oomScoreAdj
);
err
!=
nil
{
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to apply oom score %
q to PID %q
"
,
oomScoreAdj
,
pid
))
errs
=
append
(
errs
,
fmt
.
Errorf
(
"failed to apply oom score %
d to PID %d
"
,
oomScoreAdj
,
pid
))
}
}
...
...
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