Skip to content
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

WIP Initial attempt at adding Criu support to Docker #2

Open
wants to merge 602 commits into
base: docker-master
Choose a base branch
from

Conversation

boucher
Copy link
Owner

@boucher boucher commented Apr 9, 2015

This branch represents a merge of current Docker master with the libcontainer criu and swrk branches, along with @SaiedKazemi's original Docker criu branch. In addition to trying to get those branches working, a few features have been added tot he Criu support (in various states of completion), chiefly: being able to specify output directories and being able to leave the process running after checkpointing.

(removed committed vendor code from other branch)

@boucher boucher changed the title Initial attempt at adding Criu support to Docker WIP Initial attempt at adding Criu support to Docker Apr 9, 2015
@SaiedKazemi
Copy link

@boucher
This is great. Thanks for integrating C/R into the latest Docker head. The review process on my part will unfortunately be slow due to other high priority activities and then traveling (vacation/work).

jessfraz and others added 27 commits April 20, 2015 17:20
Enhanced port integration-cli tests
Add -H|--human command-line flag to `docker history`
Enable "netgo" library when we build with gccgo
Clarify data volume init with existing data
Signed-off-by: Antonio Murdaca <[email protected]>
Docker-DCO-1.1-Signed-off-by: Dan Walsh <[email protected]> (github: rhatdan)
Signed-off-by: Alexander Morozov <[email protected]>
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <[email protected]>
Signed-off-by: Antonio Murdaca <[email protected]>
Signed-off-by: Antonio Murdaca <[email protected]>
It was unused

Signed-off-by: Alexander Morozov <[email protected]>
…onfig

Remove not needed call to container.readHostConfig()
moving integration tests to graph unit tests
…ctions-from-doc

Remove some unsupported instructions in the docs.
Adding in Seb's comments
Updating with Fred's comments

Signed-off-by: Mary Anthony <[email protected]>
estesp and others added 25 commits April 28, 2015 08:11
Add support for exclusion rules in dockerignore
…actor

Expose whole Response struct in sockRequestRaw
Implement daemon suite for integration-cli
…appers

Expose the getResourcePath and getRootResourcePath wrappers.
Fix docker rename help not consistent with other commands
Should fix moby#11598

Signed-off-by: Vincent Demeester <[email protected]>
… handled outside with a channel

Signed-off-by: Antonio Murdaca <[email protected]>
…d-cgroups

Option to configure cgroup manager (adds --exec-opt)
Append DROP rule with --icc=false, not insert
…integration-cli

c.Fatal won't fail and exit test inside a goroutine
…ting-term

Add error check before getting term
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.

Signed-off-by: Ahmet Alp Balkan <[email protected]>
docs: Add more places docker.service can be at
This branch represents a merge of current Docker master with the libcontainer criu and swrk branches, along with @SaiedKazemi's original Docker criu branch. In addition to trying to get those branches working, a few features have been added tot he Criu support (in various states of completion), chiefly: being able to specify output directories and being able to leave the process running after checkpointing.
boucher pushed a commit that referenced this pull request Aug 5, 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.

[v2: a separate aufs commit is merged into this one]

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

Signed-off-by: Kir Kolyshkin <[email protected]>
boucher pushed a commit that referenced this pull request Apr 14, 2016
Fix exec start api with detach and AttachStdin at same time. fixes #2
boucher pushed a commit that referenced this pull request Dec 4, 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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.