This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[17.06] Fix error handling with not-exist errors on remove #142
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
cpuguy83
changed the title
seemethere
suggested changes
Jul 26, 2017
| @@ -50,6 +50,8 @@ import ( | |||
|
|
|||
| rsystem "github.com/opencontainers/runc/libcontainer/system" | |||
| "github.com/opencontainers/selinux/go-selinux/label" | |||
| "github.com/pkg/errors" | |||
| "github.com/vbatts/tar-split/tar/storage" | |||
There was a problem hiding this comment.
You don't need to add this here, it's already added on line 40.
It's causing this error in the build jobs:
00:02:39.788 [init] ---> Making bundle: binary (in bundles/17.06.1-ce-rc1/binary)
00:02:40.046 [init] Building: bundles/17.06.1-ce-rc1/binary-daemon/dockerd-17.06.1-ce-rc1
00:03:36.261 [init] # github.com/docker/docker/daemon/graphdriver/aufs
00:03:36.261 [init] daemon/graphdriver/aufs/aufs.go:54: storage redeclared as imported package name
00:03:36.261 [init] previous declaration at daemon/graphdriver/aufs/aufs.go:40
Specifically, none of the graphdrivers are supposed to return a not-exist type of error on remove (or at least that's how they are currently handled). Found that AUFS still had one case where a not-exist error could escape, when checking if the directory is mounted we call a `Statfs` on the path. This fixes AUFS to not return an error in this case, but also double-checks at the daemon level on layer remove that the error is not a `not-exist` type of error. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit d42dbdd) Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
cherry-pick-33960
branch
from
02dd607
to
b6df63d
Compare
|
LGTM |
Merged
docker-jenkins
pushed a commit
that referenced
this pull request
Aug 17, 2018
Remove arch specific dockerfiles for RPM building Upstream-commit: 0d23632 Component: packaging
docker-jenkins
pushed a commit
that referenced
this pull request
Dec 29, 2018
…_return_code Revert "[18.09 backport] API: fix status code on conflicting service names" Upstream-commit: ce8b8f1cf33bb33811077be3b0b972dd2dbc4c79 Component: engine
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Feb 3, 2020
[17.06] Fix error handling with not-exist errors on remove
akrasnov-drv
pushed a commit
to drivenets/docker-ce
that referenced
this pull request
Apr 23, 2023
Remove arch specific dockerfiles for RPM building
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport moby/moby#33960 Fix error handling with not-exist errors on remove
Cherry-pick commit moby/moby@d42dbdd