Re-enable TestApplyLayer and make it work #3207
Merged
Conversation
This file contains 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
Rather than calling out to tar we use the golang tar parser to directly extract the tar files. This has two major advantages: 1) We're able to replace an existing directory with a file in the new layer. This currently breaks with the external tar, since it refuses to recursively remove the destination directory in this case, and there are no options to make it do that. 2) We avoid extracting the whiteout files just to later remove them.
The default gnu tar format has no sub-second precision mtime support, and the golang tar writer currently doesn't support that either. This means if we export the changes from a container we will not get zeron in the sub-second precision field when the change is applied. This means we can't compare that to the original without getting a spurious change. So, we detect this case by treating a case where the seconds match and either of the two nanoseconds are zero as equal.
With the previous two changes we now pass this test.
|
ping @creack |
|
@alexlarsson I'm getting a few test failures but I'll help look into these because this approach is very good and will allow us not remove some of the custom code in aufs. Thanks! --- FAIL: TestMount (0.00 seconds)
graph_test.go:28: open /tmp/docker-graph-440920701/vfs/dir/0583af602d9a8f4382f14ab327cf677e6d8e12f52ba58769cbb54863835efbf2/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestInterruptedRegister (0.00 seconds)
graph_test.go:85: open /tmp/docker-graph-092756919/vfs/dir/4eb8654991357fa9d86635cef433f035c7e083e7a8368e93a53bc004aa3b5192/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestGraphCreate (0.00 seconds)
graph_test.go:100: open /tmp/docker-graph-114180010/vfs/dir/f9c1a7501df45f15638268f43331c66b790d71d039efc0dde7bec43c841f31d1/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestRegister (0.00 seconds)
graph_test.go:136: open /tmp/docker-graph-731734785/vfs/dir/d18ed898e24744393dc999c29c15931bc26cdcb6663615444c7316ac3ca838a5/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestDeletePrefix (0.00 seconds)
graph_test.go:173: open /tmp/docker-graph-095803500/vfs/dir/818db50153c7a113fca1042676c5617b5f4919c8f38c80f1b70e4499ad2d766e/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestDelete (0.00 seconds)
graph_test.go:188: open /tmp/docker-graph-328509147/vfs/dir/f996911d9a6564e36222134357e0ccde557d4ce9f4c85b39856ef2b7d06d1dcd/etc/postgres/postgres.conf: no such file or directory
--- FAIL: TestByParent (0.00 seconds)
graph_test.go:273: Expected 2 children, found 0 |
The TestLookupImage test seems to use a layer that contains /etc/postgres/postgres.conf, but not e.g. /etc/postgres. To handle this we ensure that the parent directory always exists, and if not we create it.
|
With this fix all the tests pass for me |
|
LGTM /cc @crosbymichael |
|
LGTM |
crosbymichael
added a commit
that referenced
this pull request
Dec 17, 2013
Re-enable TestApplyLayer and make it work
|
Ugh, seems this broke docker pull: Seems archive.tar doesn't do uncompression, I guess we need to wrap the tar reader with an uncompression stream. I'll have a look. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This re-enables TestApplyLayer and makes it work by re-implementing ApplyLayer() using the archive/tar go tar support.