Skip to content

Don't fail on setting -ve oom score when rootless#2326

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
cloudfoundry-incubator:pr-oom-score
May 4, 2018
Merged

Don't fail on setting -ve oom score when rootless#2326
dmcgowan merged 1 commit intocontainerd:masterfrom
cloudfoundry-incubator:pr-oom-score

Conversation

@Callisto13
Copy link
Copy Markdown
Contributor

This allows non-privileged users to use containerd.
If a non root user tried to set a negative oom score adjustment on a proc,
it will fail. Containerd should not fail if running rootless.

This is part of a larger track of work integrating containerd
into Cloudfoundry's garden with support for rootless.

Here is a link to our track of containerd/rootless work: https://www.pivotaltracker.com/n/projects/1158420/search?q=label%3A%22containerd%22

[#156343443]

Signed-off-by: Claudia Beresford [email protected]

@Callisto13 Callisto13 force-pushed the pr-oom-score branch 2 times, most recently from 764e295 to ae4a0c8 Compare May 4, 2018 15:57
This allows non-privileged users to use containerd.
If a non root user tried to set a negative oom score adjustment,
it will fail. Containerd should not fail if running rootless.

This is part of a larger track of work integrating containerd
into Cloudfoundry's garden with support for rootless.

[#156343443]

Signed-off-by: Danail Branekov <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2326 into master will decrease coverage by 0.44%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2326      +/-   ##
==========================================
- Coverage   45.43%   44.98%   -0.45%     
==========================================
  Files          83       92       +9     
  Lines        9214     9331     +117     
==========================================
+ Hits         4186     4198      +12     
- Misses       4352     4456     +104     
- Partials      676      677       +1
Flag Coverage Δ
#linux 49.29% <100%> (-0.63%) ⬇️
#windows 41.24% <ø> (ø) ⬆️
Impacted Files Coverage Δ
sys/oom_unix.go 72.72% <100%> (ø)
sys/env.go 100% <100%> (ø)
sys/reaper.go 0% <0%> (ø)
sys/filesys_unix.go 0% <0%> (ø)
sys/epoll.go 0% <0%> (ø)
sys/socket_unix.go 0% <0%> (ø)
sys/proc.go 0% <0%> (ø)
sys/fds.go 0% <0%> (ø)
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 08b43d9...544b985. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented May 4, 2018

LGTM

@dmcgowan dmcgowan merged commit fc1d936 into containerd:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants