Skip to content

[release/1.0] socket in archive and gc config fixes#2224

Merged
stevvooe merged 3 commits intocontainerd:release/1.0from
dmcgowan:backport-archive-gc-fixes
Mar 23, 2018
Merged

[release/1.0] socket in archive and gc config fixes#2224
stevvooe merged 3 commits intocontainerd:release/1.0from
dmcgowan:backport-archive-gc-fixes

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Backports #2214 and #2222

The go-tar implementation which is used cannot handle sockets.

There's no good reason to preserve a socket, they are basically useless without
the process which made them.

Signed-off-by: Ian Campbell <[email protected]>
@dmcgowan dmcgowan added this to the 1.0.3 milestone Mar 22, 2018
Comment thread fs/fstest/file.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Needs a comment, which we missed upstream.

dmcgowan and others added 2 commits March 22, 2018 16:24
@dmcgowan dmcgowan force-pushed the backport-archive-gc-fixes branch from 3b0a8a4 to 3d34cc0 Compare March 22, 2018 23:25
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2224 into release/1.0 will decrease coverage by 0.02%.
The diff coverage is 33.33%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.0    #2224      +/-   ##
===============================================
- Coverage        50.57%   50.55%   -0.03%     
===============================================
  Files               81       81              
  Lines             7171     7176       +5     
===============================================
+ Hits              3627     3628       +1     
- Misses            2849     2853       +4     
  Partials           695      695
Flag Coverage Δ
#linux 50.55% <33.33%> (-0.03%) ⬇️
Impacted Files Coverage Δ
gc/scheduler/scheduler.go 70.32% <0%> (-0.92%) ⬇️
archive/tar.go 50.3% <50%> (-0.16%) ⬇️

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 c0f92dd...3d34cc0. Read the comment docs.

@stevvooe
Copy link
Copy Markdown
Member

LGTM

@stevvooe stevvooe merged commit a609ec4 into containerd:release/1.0 Mar 23, 2018
@dmcgowan dmcgowan deleted the backport-archive-gc-fixes branch September 10, 2019 17:44
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