-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Add direct unpack support for overlay and aufs #2913
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| // +build linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package archive | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "io/ioutil" | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/containerd/aufs" | ||
| "github.com/containerd/containerd/archive/tartest" | ||
| "github.com/containerd/containerd/mount" | ||
| "github.com/containerd/containerd/pkg/testutil" | ||
| "github.com/containerd/containerd/snapshots/overlay" | ||
| "github.com/containerd/continuity/fs/fstest" | ||
| ) | ||
|
|
||
| func runWriterToTarTest(t *testing.T, name string, wt tartest.WriterToTar, a fstest.Applier, validate func(string) error, applyErr error) { | ||
| t.Run(name, makeWriterToTarNaiveTest(wt, a, validate, applyErr)) | ||
| t.Run(name+"Overlay", makeWriterToTarOverlayTest(wt, a, validate, applyErr)) | ||
| t.Run(name+"Aufs", makeWriterToTarAufsTest(wt, a, validate, applyErr)) | ||
| } | ||
|
|
||
| func makeWriterToTarOverlayTest(wt tartest.WriterToTar, a fstest.Applier, validate func(string) error, applyErr error) func(*testing.T) { | ||
| return func(t *testing.T) { | ||
| testutil.RequiresRoot(t) | ||
| if err := overlay.Supported("/"); err != nil { | ||
| t.Skipf("skipping because overlay is not supported %v", err) | ||
| } | ||
| ud, err := ioutil.TempDir("", "test-writer-to-tar-overlay-upper") | ||
| if err != nil { | ||
| t.Fatalf("Failed to create temp dir: %v", err) | ||
| } | ||
| defer os.RemoveAll(ud) | ||
| wd, err := ioutil.TempDir("", "test-writer-to-tar-overlay-work") | ||
| if err != nil { | ||
| t.Fatalf("Failed to create temp dir: %v", err) | ||
| } | ||
| defer os.RemoveAll(wd) | ||
|
|
||
| apply := func(ctx context.Context, _ string, tr io.Reader) error { | ||
| _, err := Apply(ctx, ud, tr, WithConvertWhiteout(OverlayConvertWhiteout)) | ||
| return err | ||
| } | ||
|
|
||
| validate := func(td string) error { | ||
| mounts := []mount.Mount{ | ||
| { | ||
| Type: "overlay", | ||
| Source: "overlay", | ||
| Options: []string{ | ||
| fmt.Sprintf("workdir=%s", wd), | ||
| fmt.Sprintf("upperdir=%s", ud), | ||
| fmt.Sprintf("lowerdir=%s", td), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| return mount.WithTempMount(context.Background(), mounts, func(root string) error { | ||
| return validate(root) | ||
| }) | ||
| } | ||
|
|
||
| makeWriterToTarTest(wt, a, apply, validate, applyErr)(t) | ||
| } | ||
| } | ||
|
|
||
| func makeWriterToTarAufsTest(wt tartest.WriterToTar, a fstest.Applier, validate func(string) error, applyErr error) func(*testing.T) { | ||
| return func(t *testing.T) { | ||
| testutil.RequiresRoot(t) | ||
| if err := aufs.Supported(); err != nil { | ||
| t.Skipf("skipping because aufs is not supported %v", err) | ||
| } | ||
| d, err := ioutil.TempDir("", "test-writer-to-tar-aufs-rw") | ||
| if err != nil { | ||
| t.Fatalf("Failed to create temp dir: %v", err) | ||
| } | ||
| defer os.RemoveAll(d) | ||
|
|
||
| apply := func(ctx context.Context, _ string, tr io.Reader) error { | ||
| _, err := Apply(ctx, d, tr, WithConvertWhiteout(AufsConvertWhiteout)) | ||
| return err | ||
| } | ||
|
|
||
| validate := func(td string) error { | ||
| mounts := []mount.Mount{ | ||
| { | ||
| Type: "aufs", | ||
| Source: "none", | ||
| Options: []string{ | ||
| fmt.Sprintf("br:%s=rw:%s=ro+wh", d, td), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| return mount.WithTempMount(context.Background(), mounts, func(root string) error { | ||
| return validate(root) | ||
| }) | ||
| } | ||
|
|
||
| makeWriterToTarTest(wt, a, apply, validate, applyErr)(t) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // +build linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package archive | ||
|
|
||
| import ( | ||
| "archive/tar" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| // ApplyOptions provides additional options for an Apply operation | ||
| type ApplyOptions struct { | ||
| Filter Filter // Filter tar headers | ||
| ConvertWhiteout ConvertWhiteout // Convert whiteout files | ||
| } | ||
|
|
||
| // AufsConvertWhiteout converts whiteout files for aufs. | ||
| func AufsConvertWhiteout(_ *tar.Header, _ string) (bool, error) { | ||
| return true, nil | ||
| } | ||
|
|
||
| // OverlayConvertWhiteout converts whiteout files for overlay. | ||
| func OverlayConvertWhiteout(hdr *tar.Header, path string) (bool, error) { | ||
| base := filepath.Base(path) | ||
| dir := filepath.Dir(path) | ||
|
|
||
| // if a directory is marked as opaque, we need to translate that to overlay | ||
| if base == whiteoutOpaqueDir { | ||
| // don't write the file itself | ||
| return false, unix.Setxattr(dir, "trusted.overlay.opaque", []byte{'y'}, 0) | ||
| } | ||
|
|
||
| // if a file was deleted and we are using overlay, we need to create a character device | ||
| if strings.HasPrefix(base, whiteoutPrefix) { | ||
| originalBase := base[len(whiteoutPrefix):] | ||
| originalPath := filepath.Join(dir, originalBase) | ||
|
|
||
| if err := unix.Mknod(originalPath, unix.S_IFCHR, 0); err != nil { | ||
| return false, err | ||
| } | ||
| // don't write the file itself | ||
| return false, os.Chown(originalPath, hdr.Uid, hdr.Gid) | ||
| } | ||
|
|
||
| return true, nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we split this to a new function in the global scope