Commit Graph

3757 Commits

Author SHA1 Message Date
Michael Crosby
db1630d0bb
Merge pull request #2190 from stevvooe/vendor-update-btrfs
vendor: update btrfs dependency
2018-03-06 16:32:48 -05:00
Stephen J Day
23751c9ced
vendor: update btrfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-06 13:16:56 -08:00
Phil Estes
d086e56255
Merge pull request #2187 from crosbymichael/sigpipe
Handle SIGPIPE in shims
2018-03-06 13:31:39 -05:00
Michael Crosby
1eabab31aa Handle SIGPIPE in shims
ref: https://github.com/moby/moby/issues/36464

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-06 12:54:16 -05:00
Akihiro Suda
5cc915c26c overlay: add Supported() checker
This function is not called during plugin initialization (#2140),
but should be useful for downstream projects that uses overlayfs
snapshotter as a Go library.

Benchmark result on Ubuntu 17.10, GCE n1-standard-4:

BenchmarkOverlaySupportedOnExt4-4                    100          20490598 ns/op
BenchmarkOverlayUnsupportedOnFType0XFS-4           30000             39316 ns/op
BenchmarkOverlaySupportedOnFType1XFS-4               100          19287083 ns/op
BenchmarkOverlayUnsupportedOnFAT-4                   100          14217772 ns/op

i.e. the overhead is typically about 20 msec on this machine.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-06 16:53:21 +09:00
Kunal Kushwaha
f040e6ab59 CI check for file-header added
file-header check using github.com/kunalkushwaha/ltag

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-06 15:57:08 +09:00
Derek McGowan
2b6b99b4a1
Merge pull request #2184 from kunalkushwaha/oci-error
better image config parse error.
2018-03-05 10:29:02 -08:00
Kenfe-Mickaël Laventure
a1b511fb80
Merge pull request #2177 from crosbymichael/file-io
Refactor shim to support file logging
2018-03-05 07:52:45 -08:00
Phil Estes
142ecddd0d
Merge pull request #2180 from AkihiroSuda/fix-ctr-c-create-unix
ctr: add UNIX-specific flags to `ctr c create`
2018-03-05 08:53:45 -05:00
Akihiro Suda
05513284e7 ctr: add UNIX-specific flags to ctr c create
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:26:03 +09:00
Akihiro Suda
125fdeff8a linux: fix runtime-root propagation
faf2781dd2 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:01:22 +09:00
Kunal Kushwaha
6ed4e9e106 better image config parse error.
compatible oci runtime version printed with parse error

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 14:04:08 +09:00
Kunal Kushwaha
3491b9ea4a Copyright header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 10:07:58 +09:00
Phil Estes
e6a3dd3550
Merge pull request #2171 from ruediger-maass/resolver401
Adds handling of 401 for POST /v2/token without authentication
2018-03-01 15:31:30 -05:00
Derek McGowan
fd6335f74d
Merge pull request #2163 from AkihiroSuda/userns-mknod
archive: fix logic for skipping mknod when running in userns
2018-03-01 11:37:34 -08:00
Michael Crosby
c553882adc Refactor shim to support file logging
This changes the copyIO in the shim to support logging to files from
client requests in addition to fifos.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-01 14:33:23 -05:00
Phil Estes
949ddbabb5
Merge pull request #2168 from estesp/update-go-vers
Update recommended versions to Go 1.10
2018-02-28 13:17:58 -05:00
Phil Estes
b3a4e63c69
Merge pull request #2173 from AkihiroSuda/fix-shim-runtime-root
linux: propagate --runtime-root to shim properly
2018-02-28 13:17:28 -05:00
Akihiro Suda
faf2781dd2 linux: propagate --runtime-root to shim properly
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-28 14:15:22 +09:00
ruediger-maass
373f1e5612 Adds handling of 401 for POST /v2/token without authentication
This fix adds support for image registries that expect authentication for POST /v2/token such as used by the GET. E.g., JFrog Artifactory y has been observed to respond with a 401 (Unauthorized) in that case. Adding 401 in addition to the current handling of 405 and 404 in the resolver solves the authentication problem. Finally, this enables image pulls also for Artifactory.

Signed-off-by: Ruediger Maass <ruediger.maass@de.ibm.com>
2018-02-28 02:32:44 +00:00
Phil Estes
6aa612dfc2
Update recommended versions to Go 1.10
To match build requirements for containerd now that we are using 1.10.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-27 16:50:12 -08:00
Stephen Day
f334749967
Merge pull request #2165 from jessvalarezo/platforms-parse
Update Parse to return a Platform spec
2018-02-27 14:54:29 -08:00
Phil Estes
c3971b187f
Merge pull request #2164 from crosbymichael/density
Add density stress test
2018-02-27 17:27:16 -05:00
Jess Valarezo
ac8008437a update platforms Parse to return platform spec, decouple matcher
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2018-02-27 14:21:49 -08:00
Michael Crosby
a2ef6952f2 Add density stress test
Running the density tool will report Pss and Rss total and per container
values for shim memory usage. Values are reported in KB.

```bash
containerd-stress density --count 500
INFO[0000] pulling docker.io/library/alpine:latest
INFO[0000] generating spec from image
{"pss":421188,"rss":2439688,"pssPerContainer":842,"rssPerContainer":4879}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-27 16:40:37 -05:00
Michael Crosby
fd2e1f6dec
Merge pull request #2162 from stevvooe/use-go1.10
build: bump to Go 1.10
2018-02-27 15:41:55 -05:00
Akihiro Suda
fffc111ba8 archive: fix logic for skipping mknod when running in userns
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-28 03:01:02 +09:00
Michael Crosby
25c403415a
Merge pull request #2151 from Random-Liu/fix-load-task
Fix task load.
2018-02-27 11:10:45 -05:00
Stephen J Day
9cdd036393
build: bump to Go 1.10
Bumps the build to use Go 1.10, which allows us to drop the forked tar
package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-26 16:47:24 -08:00
Lantao Liu
4ac4fd0b6a Close io after task deletion to avoid race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-26 22:12:59 +00:00
Stephen Day
0273e970a4
Merge pull request #2161 from IRCody/cio_panic
Fix panics in cio/io_unix.go
2018-02-26 13:45:45 -08:00
Michael Crosby
0b86dfbc83
Merge pull request #2156 from Random-Liu/update-cri-containerd
Update cri containerd
2018-02-26 15:19:28 -05:00
Lantao Liu
4c903c356b Update critools and run critest in parallel.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-26 19:41:04 +00:00
Cody Roseborough
4c5ebfee96 Fix panics in cio/io_unix.go
Add nil checks before closing fifos to avoid panic when fifo was never
opened.

Signed-off-by: Cody Roseborough <crrosebo@amazon.com>
2018-02-26 19:22:36 +00:00
Ian Campbell
f48cc7d7fe ctr: unpack the image on run if necessary
Without this `ctr run` can fail with:

    ctr: parent snapshot sha256:70798fd80095f40b41baa5d107fb61532bfe494d96313fea01e8fcbf4e8743ee does not exist: not found

My image was produced by buildkit, which doesn't unpack (I think this makes
sense since buildkit doesn't know if I am going to run the image or export/push
it etc).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-02-26 14:23:28 +00:00
Lantao Liu
ad04781e3e Update cri-containerd to 5bd99af7db
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-24 00:09:26 +00:00
Derek McGowan
5bd99af7db
Merge pull request #2097 from Random-Liu/vendor-cri-plugin
Vendor cri plugin into containerd.
2018-02-23 13:55:13 -08:00
Derek McGowan
a1a67899f8
Shared content across namespaces
Update content ingests to use content from another namespace.
Ingests must be committed to make content available and the
client will see the sharing as an ingest which has already
been fully written to, but not completed.

Updated the database version to change the ingest record in
the database from a link key to an object with a link and
expected value. This expected value is used to indicate that
the content already exists and an underlying writer may
not yet exist.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-22 14:45:10 -08:00
Derek McGowan
b3aeba7062
Allow test runners to wrap contexts
Let the test runners choose the namespaces and
wrap the contexts. This allows the test suite to create
multiple contexts without worrying about namespacing
or leasing in the contexts.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-22 14:45:10 -08:00
Michael Crosby
9463fcbbe7
Merge pull request #2152 from cpuguy83/remove_useless_log
Remove erroneous log message
2018-02-22 12:46:10 -05:00
Brian Goff
c520ac5f87 Remove erroneous log message
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-22 12:14:14 -05:00
Derek McGowan
3b4fcf771a
Merge pull request #2112 from crosbymichael/temp-mounts
Add temp mount location to manage temp mounts
2018-02-21 12:56:23 -08:00
Derek McGowan
fc87dce767
Merge pull request #2149 from crosbymichael/reconnect
Add client.Reconnect API
2018-02-21 12:52:08 -08:00
Michael Crosby
7b653dc9ed Add client.Reconnect API
This adds a reconnect api to the client so that the client instance
stays the same and on reconnect, all tasks and containers with
references to the *Client have the correct connection.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-21 11:18:02 -05:00
Michael Crosby
255ad41cfc
Merge pull request #2008 from thaJeztah/bump-golang-to-1.10
Bump to Go 1.10
2018-02-21 10:07:18 -05:00
Sebastiaan van Stijn
b17bcb7284
Regenerate protos with Go 1.10, and make check conditional
Gofmt changed in Go 1.10, so regenerating with the new formatting.
From the Go 1.10 release notes: https://golang.org/doc/go1.10#gofmt

> Gofmt
> ... Second, single-method interface literals written on a single line,
> which are sometimes used in type assertions, are no longer split onto multiple lines.

The travis configuration was updated to skip `check-protos` on Go 1.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 10:51:43 +01:00
Sebastiaan van Stijn
931000c041
Bump to Go 1.10
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 10:50:05 +01:00
Kenfe-Mickaël Laventure
916cdb41a1
Merge pull request #2147 from darrenstahlmsft/RemoveServicing
Removing Windows servicing containers
2018-02-20 19:13:34 -08:00
Akihiro Suda
56ebee8368
Merge pull request #2146 from crosbymichael/pid-file
Add --pid-file to `ctr`
2018-02-21 11:39:45 +09:00
Darren Stahl
243467aa96 Removing Windows servicing containers
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-02-20 16:56:13 -08:00