Skip to content

[release/1.1] Cherrypick: Support >= 128 layers in overlayfs snapshots#2600

Merged
crosbymichael merged 2 commits intocontainerd:release/1.1from
estesp:cherrypick-overlayfs-mounts
Sep 7, 2018
Merged

[release/1.1] Cherrypick: Support >= 128 layers in overlayfs snapshots#2600
crosbymichael merged 2 commits intocontainerd:release/1.1from
estesp:cherrypick-overlayfs-mounts

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Aug 31, 2018

I believe this fix makes sense in the 1.1.x line as well

Auto-detect longest common dir in lowerdir option and compact it if the
option size is hitting one page size. If does, Use chdir + CLONE to do
mount thing to avoid hitting one page argument buffer in linux kernel
mount.

Signed-off-by: Wei Fu [email protected]

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Aug 31, 2018

Thanks for the consideration about 1.1 version. 😄

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Aug 31, 2018

failed caused by missing sys/env.go

sys/mount_linux_test.go:35:5:warning: undeclared name: RunningUnprivileged (staticcheck)
sys/mount_linux_test.go:35:5:warning: undeclared name: RunningUnprivileged (unused)
sys/mount_linux_test.go:35:5:warning: unused variable or constant undeclared name: RunningUnprivileged (varcheck)

maybe we add other patch for this?

Callisto13 and others added 2 commits August 30, 2018 22:25
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]>
Signed-off-by: Claudia Beresford <[email protected]>
Auto-detect longest common dir in lowerdir option and compact it if the
option size is hitting one page size. If does, Use chdir + CLONE to do
mount thing to avoid hitting one page argument buffer in linux kernel
mount.

Signed-off-by: Wei Fu <[email protected]>
@estesp estesp force-pushed the cherrypick-overlayfs-mounts branch from eb83b71 to 8a2991c Compare August 31, 2018 05:26
@estesp
Copy link
Copy Markdown
Member Author

estesp commented Aug 31, 2018

Thanks @fuweid ; I added the other required dependent commit

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2600 into release/1.1 will decrease coverage by 0.84%.
The diff coverage is 38.84%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.1    #2600      +/-   ##
===============================================
- Coverage        50.11%   49.27%   -0.85%     
===============================================
  Files               75       85      +10     
  Lines             7297     7546     +249     
===============================================
+ Hits              3657     3718      +61     
- Misses            2965     3150     +185     
- Partials           675      678       +3
Flag Coverage Δ
#linux 49.27% <38.84%> (-0.85%) ⬇️
Impacted Files Coverage Δ
sys/mount_linux.go 0% <0%> (ø)
sys/env.go 100% <100%> (ø)
sys/oom_unix.go 72.72% <100%> (ø)
mount/mount_linux.go 31.01% <60.49%> (+31.01%) ⬆️
sys/proc.go 0% <0%> (ø)
sys/socket_unix.go 0% <0%> (ø)
sys/epoll.go 0% <0%> (ø)
sys/stat_unix.go 0% <0%> (ø)
... and 4 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 8f54c75...8a2991c. Read the comment docs.

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Aug 31, 2018

LGTM 😄

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Sep 7, 2018

any update on this PR? 😄

@crosbymichael
Copy link
Copy Markdown
Member

@dmcgowan @AkihiroSuda

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Do we want this for 1.0 as well?

@crosbymichael crosbymichael merged commit db009b3 into containerd:release/1.1 Sep 7, 2018
@fuweid
Copy link
Copy Markdown
Member

fuweid commented Sep 10, 2018

Do we want this for 1.0 as well?

The 1.1 containerd has upgraded go version from 1.9 to 1.10. The commit has only been tested in go1.10. No sure it can work well in go1.9. If we have to, I can test it.

@AkihiroSuda

and cc @estesp

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.

6 participants