github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
3,757 Commits 3 Branches 2 Tags 112 MiB
400f16fc46
Commit Graph

3757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Day
a6fad51e29
Merge pull request #1869 from Ace-Tang/cio-docs-fix 
docs: fix usage of cio package in docs
 2017-12-04 14:22:04 -08:00
Phil Estes
cc969fb42f
Merge pull request #1868 from crosbymichael/unmount 
Retry unmount on EBUSY and return errors
 2017-12-04 14:04:01 -05:00
Michael Crosby
a8b543f87d rmdir tmp dirs for rootfs mounts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-04 13:51:11 -05:00
Michael Crosby
b0ca685874 Retry unmount on EBUSY and return errors 
This is another WIP to fix #1785.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-04 11:31:08 -05:00
Ace-Tang
aca8e15916 docs: fix usage of cio package in docs 
Signed-off-by: Ace-Tang <aceapril@126.com>
 2017-12-05 00:07:08 +08:00
Akihiro Suda
e427fd6197
Merge pull request #1866 from Random-Liu/lock-task-list 
Lock task list properly.
 2017-12-04 13:02:48 +09:00
Lantao Liu
71e42bf65c Lock task list properly. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-03 21:20:01 +00:00
yason
db742c90c0 get wrong parents bucket in withSnapshotBucket 
improve error message for CommitActive
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-02 23:01:29 +08:00
Stephen Day
fe4e30cbb7
Merge pull request #1859 from dmcgowan/fix-snapshot-logs 
Update snapshot and content related log messages
 2017-12-01 20:32:39 -08:00
Stephen Day
53c892d796
Merge pull request #1856 from crosbymichael/mountns 
Remove mount namespace from shim
 2017-12-01 16:01:44 -08:00
Michael Crosby
026bf2902a
Merge pull request #1861 from jessvalarezo/images-err-2 
update images error (pt. 2)
 2017-12-01 18:53:43 -05:00
Michael Crosby
96572395ad
Merge pull request #1860 from stevvooe/ignore-not-found 
integration: ignore not found error on cleanup
 2017-12-01 18:33:58 -05:00
Jess Valarezo
41ac9fac8e update images error 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-12-01 15:14:55 -08:00
Stephen J Day
0925a88639
integration: ignore not found error on cleanup 
This ignore "not found" errors that may arise during test cleanup. Since
the goal is to make the content "not found", it is okay to skip them and
not fail the test.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-01 15:06:38 -08:00
Stephen Day
271836a417
Merge pull request #1858 from jessvalarezo/images-errors 
update image error messages
 2017-12-01 14:58:12 -08:00
Michael Crosby
e28943279f
Merge pull request #1857 from stevvooe/less-noise 
cmd/ctr: move log messages to debug
 2017-12-01 17:58:04 -05:00
Derek McGowan
b28d7cdf1b
Update snapshot and content related log messages 
Make the tense and casing consistent.
Add useful log messages in image service.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-12-01 14:57:34 -08:00
Derek McGowan
8c550859d1
Merge pull request #1855 from stevvooe/update-ttrpc 
vendor: update ttrpc to pull in euid change
 2017-12-01 14:53:48 -08:00
Michael Crosby
fd2e3cd326 Remove mount namespace from shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-01 17:35:14 -05:00
Stephen J Day
1710fe9b95
cmd/ctr: move log messages to debug 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-01 13:57:54 -08:00
Jess Valarezo
2b1595124f update image error messages 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-12-01 13:54:26 -08:00
Derek McGowan
f6df9f6632
Merge pull request #1854 from yanxuean/overlay-prepare-rollback 
snapshots/overlay: cleanup rollback code for overlay.prepare
 2017-12-01 13:32:40 -08:00
Stephen J Day
4b36430425
vendor: update ttrpc to pull in euid change 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-01 12:08:15 -08:00
Akihiro Suda
222156d598
Merge pull request #1847 from jessvalarezo/metadata-errors 
metadata: update container error messages
 2017-12-02 04:42:40 +09:00
Jess Valarezo
b873ae8b55 metadata: update container error messages 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-12-01 10:32:48 -08:00
yason
bb02302c9c improve rollback for overlay.prepare 
improve err message
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-02 00:09:44 +08:00
Michael Crosby
38fdf9c8c9
Merge pull request #1846 from crosbymichael/service 
Add rlimits to service file
 2017-12-01 10:21:39 -05:00
Phil Estes
16a2177ae3
Merge pull request #1852 from yanxuean/error-log 
improve error message
 2017-12-01 10:07:54 -05:00
yason
4f1c0e067e improve error message 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-01 15:45:15 +08:00
Akihiro Suda
c9c36d4afa
Merge pull request #1849 from stevvooe/unix-socket-credentials 
cmd/containerd-shim: require unix socket credentials
 2017-12-01 14:08:42 +09:00
Stephen J Day
2d966df174
cmd/containerd-shim: require unix socket credentials 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-30 20:34:29 -08:00
Phil Estes
efe9e284fd
Merge pull request #1850 from mlaventure/min-kern-version 
Fix flexible kernel version
 2017-11-30 20:42:34 -05:00
Kenfe-Mickael Laventure
9d759203b0
Fix flexible kernel version 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-11-30 17:31:00 -08:00
Derek McGowan
08f179386e
Merge pull request #1848 from dmcgowan/update-version-rc.0 
Prepare release v1.0.0-rc.0
 2017-11-30 16:35:22 -08:00
Derek McGowan
30ac46e9cf
Update version to v1.0.0-rc.0 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-30 16:16:13 -08:00
Derek McGowan
4bcd272c14
Merge pull request #1845 from dmcgowan/fix-rc.0-notes 
Update previous version to beta not current rc
 2017-11-30 16:02:59 -08:00
Michael Crosby
b009642e1a Add rlimits to service file 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-30 18:50:32 -05:00
Derek McGowan
6952a61daa
Update previous version to beta not current rc 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-30 15:48:43 -08:00
Derek McGowan
7e4be4639a
Merge pull request #1834 from dmcgowan/v1.0.0-rc.0-notes 
Add release notes for v1.0.0-rc.0
 2017-11-30 15:44:43 -08:00
Derek McGowan
07d4154515
Merge pull request #1844 from Random-Liu/close-fifos-on-failure 
Close FIFOs on failure.
 2017-11-30 15:40:40 -08:00
Lantao Liu
a03fdabc14 Close FIFOs on failure. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-30 23:19:12 +00:00
Derek McGowan
e64d179163
Add release notes for v1.0.0-rc.0 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-30 14:58:44 -08:00
Derek McGowan
763d29f4c2
Merge pull request #1842 from dmcgowan/fix-snapshot-close-twice 
Fix close twice test to retain snapshots
 2017-11-30 14:57:48 -08:00
Derek McGowan
25b5592eaf
Fix close twice test to retain snapshot 
Update to set labels and use a unique key

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-30 14:43:33 -08:00
Michael Crosby
2657e49fc1
Merge pull request #1835 from stevvooe/we-use-ttrpc 
shim: we use ttrpc in the shim now
 2017-11-30 16:35:42 -05:00
Stephen J Day
6c416fa3a7
shim: we use ttrpc in the shim now 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-30 12:58:40 -08:00
Stephen Day
c357934f0f
Merge pull request #1841 from crosbymichael/parse-uid 
Use strconv.Atoi for uid/gid parsing
 2017-11-30 12:56:20 -08:00
Michael Crosby
a4a4c90ed3 Use strconv.Atoi for uid/gid parsing 
This follows the same logic that runc uses for parsing uid/gid values.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-30 15:22:41 -05:00
Stephen Day
8fbdd5c63d
Merge pull request #1840 from kolyshkin/mkdir-all 
MkdirAll: fix usage
 2017-11-30 11:21:59 -08:00
Kir Kolyshkin
acc6f4ec77 MkdirAll: fix usage 
(below is a quote from my runc commit 6f82d4b)

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>
 2017-11-30 10:18:08 -08:00