Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Don't unmount entire plugin manager tree on remove #2

Merged
merged 1 commit into from
Jun 5, 2017

Conversation

mlaventure
Copy link
Contributor

@mlaventure mlaventure commented May 31, 2017

This was mistakenly unmounting everything under plugins/* instead of
just plugins/<id>/* anytime a plugin is removed.

Signed-off-by: Brian Goff cpuguy83@gmail.com
(cherry picked from commit db5f317)

--
Cherry pick of moby/moby#33422

This was mistakenly unmounting everything under `plugins/*` instead of
just `plugins/<id>/*` anytime a plugin is removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db5f317)
@mavenugo mavenugo mentioned this pull request May 31, 2017
23 tasks
@andrewhsu
Copy link
Contributor

LGTM

integration and unit tests are green

@andrewhsu andrewhsu merged commit 9a732db into docker-archive:17.06 Jun 5, 2017
@mlaventure mlaventure deleted the chp-moby-33422 branch June 5, 2017 15:04
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
andrewhsu pushed a commit that referenced this pull request Dec 1, 2017
This subtle bug keeps lurking in because error checking for `Mkdir()`
and `MkdirAll()` is slightly different wrt to `EEXIST`/`IsExist`:

 - for `Mkdir()`, `IsExist` error should (usually) be ignored
   (unless you want to make sure directory was not there before)
   as it means "the destination directory was already there"

 - for `MkdirAll()`, `IsExist` error should NEVER be ignored.

Mostly, this commit just removes ignoring the IsExist error, as it
should not be ignored.

Also, there are a couple of cases then IsExist is handled as
"directory already exist" which is wrong. As a result, some code
that never worked as intended is now removed.

NOTE that `idtools.MkdirAndChown()` behaves like `os.MkdirAll()`
rather than `os.Mkdir()` -- so its description is amended accordingly,
and its usage is handled as such (i.e. IsExist error is not ignored).

For more details, a quote from my runc commit 6f82d4b (July 2015):

    TL;DR: check for IsExist(err) after a failed MkdirAll() is both
    redundant and wrong -- so two reasons to remove it.

    Quoting MkdirAll documentation:

    > MkdirAll creates a directory named path, along with any necessary
    > parents, and returns nil, or else returns an error. If path
    > is already a directory, MkdirAll does nothing and returns nil.

    This means two things:

    1. If a directory to be created already exists, no error is
    returned.

    2. If the error returned is IsExist (EEXIST), it means there exists
    a non-directory with the same name as MkdirAll need to use for
    directory. Example: we want to MkdirAll("a/b"), but file "a"
    (or "a/b") already exists, so MkdirAll fails.

    The above is a theory, based on quoted documentation and my UNIX
    knowledge.

    3. In practice, though, current MkdirAll implementation [1] returns
    ENOTDIR in most of cases described in #2, with the exception when
    there is a race between MkdirAll and someone else creating the
    last component of MkdirAll argument as a file. In this very case
    MkdirAll() will indeed return EEXIST.

    Because of #1, IsExist check after MkdirAll is not needed.

    Because of #2 and #3, ignoring IsExist error is just plain wrong,
    as directory we require is not created. It's cleaner to report
    the error now.

    Note this error is all over the tree, I guess due to copy-paste,
    or trying to follow the same usage pattern as for Mkdir(),
    or some not quite correct examples on the Internet.

    [1] https://github.com/golang/go/blob/f9ed2f75/src/os/path.go

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 516010e
Component: engine
docker-jenkins pushed a commit that referenced this pull request Jul 6, 2018
[18.06] Update Microsoft/go-winio to 0.4.8
Upstream-commit: 0d029b0a42fd682f6b0b5c35e9c1762c6b0173cb
Component: engine
docker-jenkins pushed a commit that referenced this pull request Jul 13, 2018
When go-1.11beta1 is used for building, the following error is
reported:

> 14:56:20 daemon\graphdriver\lcow\lcow.go:236: Debugf format %s reads
> arg #2, but call has 1 arg

While fixing this, let's also fix a few other things in this
very function (startServiceVMIfNotRunning):

1. Do not use fmt.Printf when not required.
2. Use `title` whenever possible.
3. Don't add `id` to messages as `title` already has it.
4. Remove duplicated colons.
5. Try to unify style of messages.
6. s/startservicevmifnotrunning/startServiceVMIfNotRunning/
...

In general, logging/debugging here is a mess and requires much more
love than I can give it at the moment. Areas for improvement:

1. Add a global var logger = logrus.WithField("storage-driver", "lcow")
and use it everywhere else in the code.
2. Use logger.WithField("id", id) whenever possible (same for "context"
and other similar fields).
3. Revise all the errors returned to be uniform.
4. Make use of errors.Wrap[f] whenever possible.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: b7a95a3ce4c731c0fca204435be758ea89d6050f
Component: engine
akosyrev referenced this pull request Oct 8, 2018
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 944fa71
Component: packaging
ShemTovYosef referenced this pull request in jingxiaolu/docker-ce Jan 11, 2020
Signed-off-by: l00397676 <lujingxiao@huawei.com>
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
…rget

Make the hash_files target non interactive
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Don't unmount entire plugin manager tree on remove
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants