Skip to content

Close the inherited socket fd#3359

Merged
estesp merged 1 commit intocontainerd:masterfrom
keloyang:close-socket-fd
Jun 20, 2019
Merged

Close the inherited socket fd#3359
estesp merged 1 commit intocontainerd:masterfrom
keloyang:close-socket-fd

Conversation

@keloyang
Copy link
Copy Markdown
Contributor

@keloyang keloyang commented Jun 20, 2019

containerd-shim has dup the fd 3, and it don't need fd 3 any more.

before this pr,

[root@centos3 containerd]# ps -eaf|grep shim   
root     26959 24846  0 19:31 ?        00:00:00 docker-containerd-shim -namespace moby -workdir /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/b6faed158d9f22c3a47409714972affdb1af2d98363962f5e2fa9a3ef533ae52 -address /var/run/docker/containerd/docker-containerd.sock -containerd-binary /usr/bin/containerd -runtime-root /var/run/docker/runtime-kata-runtime -debug
[root@centos3 containerd]# ls /proc/26959/fd
lr-x------. 1 root root 64 Jun 20 19:24 0 -> /dev/null
lrwx------. 1 root root 64 Jun 20 19:24 1 -> socket:[198373]
lrwx------. 1 root root 64 Jun 20 19:24 10 -> socket:[459676]
lrwx------. 1 root root 64 Jun 20 19:24 11 -> socket:[462088]
l-wx------. 1 root root 64 Jun 20 19:24 12 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdin
l---------. 1 root root 64 Jun 20 19:24 13 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdin
l---------. 1 root root 64 Jun 20 19:24 14 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdin
lrwx------. 1 root root 64 Jun 20 19:24 15 -> /dev/pts/ptmx
lr-x------. 1 root root 64 Jun 20 19:24 16 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdin
l---------. 1 root root 64 Jun 20 19:24 17 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdout
l-wx------. 1 root root 64 Jun 20 19:24 18 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdout
l---------. 1 root root 64 Jun 20 19:24 19 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdout
lrwx------. 1 root root 64 Jun 20 19:24 2 -> socket:[198373]
lr-x------. 1 root root 64 Jun 20 19:24 20 -> /run/docker/containerd/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/init-stdout
lrwx------. 1 root root 64 Jun 20 19:24 3 -> socket:[459676]
l---------. 1 root root 64 Jun 20 19:24 4 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/shim.stdout.log
lrwx------. 1 root root 64 Jun 20 19:24 5 -> anon_inode:[eventpoll]
lrwx------. 1 root root 64 Jun 20 19:24 6 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/shim.stdout.log
l---------. 1 root root 64 Jun 20 19:24 7 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/shim.stderr.log
lrwx------. 1 root root 64 Jun 20 19:24 8 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/d11114fec65d1c5b3cae0e49008d81f2034cd02af88fd3b5a8a18f2df8776f1c/shim.stderr.log
lrwx------. 1 root root 64 Jun 20 19:24 9 -> anon_inode:[eventpoll]

after this pr,

[root@centos3 containerd]# ps -eaf|grep shim   
root     26979 24846  0 19:31 ?        00:00:00 docker-containerd-shim -namespace moby -workdir /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/b6faed158d9f22c3a47409714972affdb1af2d98363962f5e2fa9a3ef533ae52 -address /var/run/docker/containerd/docker-containerd.sock -containerd-binary /usr/bin/containerd -runtime-root /var/run/docker/runtime-kata-runtime -debug
[root@centos3 containerd]# ls /proc/26979/fd
lr-x------. 1 root root 64 Jun 20 19:19 0 -> /dev/null
lrwx------. 1 root root 64 Jun 20 19:19 1 -> socket:[198373]
lrwx------. 1 root root 64 Jun 20 19:19 10 -> socket:[461345]
lrwx------. 1 root root 64 Jun 20 19:19 11 -> socket:[453351]
l---------. 1 root root 64 Jun 20 19:17 13 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdin
l---------. 1 root root 64 Jun 20 19:17 14 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdin
lrwx------. 1 root root 64 Jun 20 19:19 15 -> /dev/pts/ptmx
lr-x------. 1 root root 64 Jun 20 19:19 16 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdin
l---------. 1 root root 64 Jun 20 19:17 17 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdout
l-wx------. 1 root root 64 Jun 20 19:19 18 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdout
l---------. 1 root root 64 Jun 20 19:17 19 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdout
lrwx------. 1 root root 64 Jun 20 19:19 2 -> socket:[198373]
lr-x------. 1 root root 64 Jun 20 19:19 20 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdout
l-wx------. 1 root root 64 Jun 20 19:19 21 -> /run/docker/containerd/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/init-stdin
l---------. 1 root root 64 Jun 20 19:17 4 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/shim.stdout.log
lrwx------. 1 root root 64 Jun 20 19:19 5 -> anon_inode:[eventpoll]
lrwx------. 1 root root 64 Jun 20 19:19 6 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/shim.stdout.log
l---------. 1 root root 64 Jun 20 19:17 7 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/shim.stderr.log
lrwx------. 1 root root 64 Jun 20 19:19 8 -> /var/lib/docker/containerd/daemon/io.containerd.runtime.v1.linux/moby/8fbd7e704d126f0970b64c87c3c1475009f393a673b44a7da6eb1e237f67bfec/shim.stderr.log
lrwx------. 1 root root 64 Jun 20 19:19 9 -> anon_inode:[eventpoll]

Signed-off-by: Shukui Yang [email protected]

@keloyang
Close the inherited socket fd
ec78305 
containerd-shim has dup the fd 3, and it don't need fd 3 any more.

Signed-off-by: Shukui Yang <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 20, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jun 20, 2019

Codecov Report

Merging #3359 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3359   +/-   ##
=======================================
  Coverage   45.08%   45.08%           
=======================================
  Files         113      113           
  Lines       12542    12542           
=======================================
  Hits         5654     5654           
  Misses       6032     6032           
  Partials      856      856
Flag Coverage Δ
#linux 49.01% <ø> (ø) ⬆️
#windows 40.26% <ø> (ø) ⬆️

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 111b082...ec78305. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Jun 20, 2019

LGTM

Learned something new today, I didn't know that ListenFD function dups the fd that you provide it.

Thanks!

estesp
estesp approved these changes Jun 20, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Should we back port to 1.2?

@estesp estesp merged commit b95f0a6 into containerd:master Jun 20, 2019
@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Jun 20, 2019

ya, i think this is a safe change to backport to 1.1 and 1.2

This was referenced Jun 21, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@keloyang @codecov-io @crosbymichael @estesp