Skip to content

archive: fixes missing whiteout parent directories#2095

Merged
stevvooe merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-whiteout-parent-directories
Feb 5, 2018
Merged

archive: fixes missing whiteout parent directories#2095
stevvooe merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-whiteout-parent-directories

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Feb 3, 2018

Ensures include parents is called for whiteouts

Fixes #2094

@dmcgowan
Fixes missing whiteout parent directories
d778dd1 
Ensures include parents is called for whiteouts

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan added this to the 1.0.2 milestone Feb 3, 2018
@tonistiigi tonistiigi mentioned this pull request Feb 3, 2018
Closed
@codecov-io
Copy link
Copy Markdown

codecov-io commented Feb 3, 2018

Codecov Report

Merging #2095 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2095      +/-   ##
==========================================
- Coverage   45.37%   45.36%   -0.02%     
==========================================
  Files          96       96              
  Lines        9447     9450       +3     
==========================================
  Hits         4287     4287              
- Misses       4449     4451       +2     
- Partials      711      712       +1
Flag Coverage Δ
#linux 50.26% <0%> (-0.02%) ⬇️
#windows 40.27% <0%> (-0.02%) ⬇️
Impacted Files Coverage Δ
archive/tar.go 43.11% <0%> (-0.3%) ⬇️

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 83cf371...d778dd1. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Feb 5, 2018

LGTM

1 similar comment
@stevvooe
Copy link
Copy Markdown
Member

stevvooe commented Feb 5, 2018

LGTM

@stevvooe stevvooe merged commit aa49e70 into containerd:master Feb 5, 2018
@dmcgowan dmcgowan mentioned this pull request Feb 5, 2018
Merged
@tonistiigi
Copy link
Copy Markdown
Member

tonistiigi commented Feb 9, 2018

After testing the original testcase(#2094) in buildkit with this fix this now seems to break already during the compare phase.

error: failed to solve: rpc error: code = Unknown desc = failed calculaing diff pairs for exported snapshot: mount callback failed on /tmp/containerd-WithTempMount737087017: mount callback failed on /tmp/containerd-WithTempMount631635316: failed to write compressed diff: failed to create diff tar stream: stat /tmp/containerd-WithTempMount631635316/usr/share/aclocal-1.15: no such file or directory

time="2018-02-09T11:56:52-08:00" level=error msg="/moby.buildkit.v1.Control/Solve returned error: stat /tmp/containerd-WithTempMount631635316/usr/share/aclocal-1.15: no such file or directory
failed to create diff tar stream
github.com/moby/buildkit/vendor/github.com/containerd/containerd/archive.WriteDiff
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/archive/tar.go:62
github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking.(*walkingDiff).Compare.func1.1
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking/differ.go:99
github.com/moby/buildkit/vendor/github.com/containerd/containerd/mount.WithTempMount
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/mount/mount.go:71
github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking.(*walkingDiff).Compare.func1
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking/differ.go:66
github.com/moby/buildkit/vendor/github.com/containerd/containerd/mount.WithTempMount
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/mount/mount.go:71
github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking.(*walkingDiff).Compare
	/home/dev2/data/go/src/github.com/moby/buildkit/vendor/github.com/containerd/containerd/diff/walking/differ.go:65
github.com/moby/buildkit/cache/blobs.GetDiffPairs.func2.1

@tonistiigi tonistiigi mentioned this pull request Feb 9, 2018
Closed
@dmcgowan dmcgowan deleted the fix-whiteout-parent-directories branch June 5, 2018 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.0.2

Development

Successfully merging this pull request may close these issues.

5 participants

@dmcgowan @codecov-io @crosbymichael @stevvooe @tonistiigi