Commit Graph

4032 Commits

Author SHA1 Message Date
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
Michael Crosby
8114d2f2e2
Merge pull request #1838 from estesp/mention-kernel-vers
Add runtime requirements section to README
2017-11-30 11:38:11 -05:00
Michael Crosby
e974099b8c
Merge pull request #1839 from crosbymichael/test-long-exec
Add test for large exec payload
2017-11-30 11:33:28 -05:00
Phil Estes
a87062efdd
Add runtime requirements section to README
Add details on kernel version, criu, snapshotters, and links to existing
sections for developers/criu details.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-11-30 11:12:33 -05:00
Kenfe-Mickaël Laventure
6bff39c643
Merge pull request #1837 from crosbymichael/bump-cgroups
Update cgroups to 29da22c6171a4316169f9205ab6c49f5
2017-11-30 08:03:22 -08:00
Michael Crosby
68bec1e9ce Add test for large exec payload
Test for #1826

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 11:03:18 -05:00
Michael Crosby
c4b11148f9
Merge pull request #1831 from stevvooe/update-ttrpc
vendor: update ttrpc with latest changes
2017-11-30 10:33:50 -05:00
Michael Crosby
4349df4554 Update cgroups to 29da22c6171a4316169f9205ab6c49f5
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 10:15:37 -05:00
Stephen J Day
393cf8e8fc
vendor: update ttrpc with latest changes
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-29 21:37:50 -08:00
Derek McGowan
96ca9738ca
Merge pull request #1797 from jessvalarezo/rename-packages
rename snapshot->snapshots packages, add aliases
2017-11-29 17:53:11 -08:00
Michael Crosby
04dab2acd6
Merge pull request #1832 from crosbymichael/stress-kill
Fix stress test tool exec kill
2017-11-29 18:54:45 -05:00
Jess Valarezo
1dd6f339a2 rename snapshot->snapshots proto pkg and service
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-29 14:55:24 -08:00
Jess Valarezo
9885edfc44 rename snapshot->snapshots pkg
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-29 14:55:02 -08:00
Michael Crosby
4363994d87 Fix stress test tool exec kill
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-29 17:54:16 -05:00
Jess Valarezo
61c8fe2307 ctr: snapshot->snapshots cmd, add aliases
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-11-29 14:34:02 -08:00
Phil Estes
59bd196711
Merge pull request #1830 from stevvooe/define-fieldpath-support-envelope
events: define fieldpath implement for envelope
2017-11-29 17:21:26 -05:00
Michael Crosby
16d3aeb515
Merge pull request #1829 from AkihiroSuda/ctr-envvar-snapshotter
ctr: add EnvVar `CONTAINERD_SNAPSHOTTER` for `--snapshotter`
2017-11-29 17:19:31 -05:00
Stephen J Day
d7c950e145
events: define fieldpath implement for envelope
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-29 14:03:32 -08:00
Michael Crosby
a56e7420a7
Merge pull request #1812 from darrenstahlmsft/revendor
Revendor hcsshim and go-tar
2017-11-29 15:52:07 -05:00
Michael Crosby
d298f9a070
Merge pull request #1824 from kolyshkin/static-build
plugins: don't compile for static build
2017-11-29 10:27:06 -05:00
Phil Estes
3da99ed7a5
Merge pull request #1825 from mlaventure/use-defaults-pkg-everywhere
Use defaults pkg for all platforms
2017-11-29 09:26:12 -05:00
Akihiro Suda
7f95b9f987 ctr: add EnvVar CONTAINERD_SNAPSHOTTER for --snapshotter
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-11-29 19:11:10 +09:00
Kir Kolyshkin
0d682e24a1 plugins: don't compile for static build
We can't really use `dlopen()` from a statically built binary, so
let's disable this functionality if `static_build` tag is used
(which is sort of a de-facto standard way of doing it).

This eliminates the following warning:

	🇩 bin/containerd
	# github.com/containerd/containerd/cmd/containerd
	/tmp/go-link-509179974/000004.o: In function `pluginOpen':
	/usr/local/go/src/plugin/plugin_dlopen.go:19: warning: Using 'dlopen' in
	statically linked applications requires at runtime the shared libraries
	from the glibc version used for linking

[v2: add static build instructions to BUILDING.md]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-11-28 21:29:09 -08:00
Kenfe-Mickael Laventure
6bf779c589
Use defaults pkg for all platforms
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-11-28 18:04:21 -08:00
Derek McGowan
bc9cb25012
Update tar to use PAXRecords instead of Xattrs
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-28 17:03:14 -08:00
Derek McGowan
16d00870ef
Add test for prefix header issue
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-11-28 16:38:26 -08:00