Stephen Day
a64399acc2
Merge pull request #1341 from mlaventure/enable-test-parallelism
...
Enable test parallelism
2017-08-14 15:18:37 -07:00
Stephen Day
72159bf4a4
Merge pull request #1325 from dmcgowan/diffid-labels
...
content: commit options
2017-08-14 15:17:37 -07:00
Kenfe-Mickael Laventure
2abaf6e964
Fix possible deadlock in WithProcessKill
...
We were not checking the error value of `Kill` leading to deadlock if the
process didn't exist.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
b02e9a844e
Fix TestContainerNoBinaryExists on windows
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
104a8088ca
Add integration-parallel to Travis & AppVeyor CIs
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-14 14:43:43 -07:00
Kenfe-Mickael Laventure
eb0970bbd1
Mark relevant tests as elligible for parallelism
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-14 14:43:43 -07:00
Stephen Day
938810e706
Merge pull request #1311 from abhinandanpb/client_int
...
Exposing helper functions to access internal image information
2017-08-14 14:03:26 -07:00
Stephen Day
ca6b46320a
Merge pull request #1343 from Random-Liu/change-io-to-interface
...
Change IO to interface.
2017-08-14 13:28:34 -07:00
Michael Crosby
dbb63b636b
Merge pull request #1346 from stevvooe/disallow-runtime-update
...
metadata: disallow changing the runtime of an existing container
2017-08-14 15:15:43 -04:00
Lantao Liu
8e2c95f9c1
Change IO to interface.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-14 18:53:12 +00:00
Phil Estes
c288fbe973
Merge pull request #1354 from crosbymichael/null-io
...
Add null io option
2017-08-14 14:30:00 -04:00
Stephen Day
6a4a09d3c9
Merge pull request #1351 from jessvalarezo/check-nil-spec
...
metadata: container spec nil check
2017-08-14 11:29:16 -07:00
Michael Crosby
eb58ecab7c
Add null io option
...
This adds null IO option for efficient handling of IO.
It provides a container directly with `/dev/null` and does not require
any io.Copy within the shim whenever a user does not want the IO of the
container.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-14 13:09:16 -04:00
Kenfe-Mickaël Laventure
cf1b59348e
Merge pull request #1348 from AkihiroSuda/remove-unused
...
rootfs: remove unused functions
2017-08-14 08:21:27 -07:00
Jess Valarezo
e5cf1471dc
metadata: container spec nil check
...
Prevent panic from Marshal on a nil container spec
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-08-13 19:00:28 -07:00
Phil Estes
77035a6e65
Merge pull request #1345 from crosbymichael/gorunc
...
Update go-runc to b85ac701de5065a66918203dd18f05
2017-08-12 12:04:40 -04:00
Akihiro Suda
4e2337794c
rootfs: remove unused functions
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-08-12 07:08:28 +00:00
Derek McGowan
ca9dec32de
Merge pull request #1329 from tophj-ibm/change-test-image
...
Change testImage based on GOARCH
2017-08-11 22:38:51 -07:00
Abhinandan Prativadi
7a5d592372
Exposing helpers to access internal structure
...
Adding image.Config,image.Size,image.RootFS to retrieve the internal image information
which will be needed by consumers of containerd
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-11 17:09:29 -07:00
Stephen Day
a3801b73fb
Merge pull request #1344 from crosbymichael/ops
...
Add section for `state` dir
2017-08-11 16:21:20 -07:00
Stephen J Day
d7689418ed
metadata: disallow changing the runtime of an existing container
...
This could render tasks for a container unresolvalbe. If there is a use
case for changing the runtime of a container, we should think it through
carefully.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-11 16:19:25 -07:00
Derek McGowan
da34812db6
Update differ to support compressed archives
...
Differ is updated to set a label for the uncompressed hash
of compressed content. This allows compressed blobs to
be used and looked up for their uncompressed hashes.
Uses commit options to set labels.
Updates rootfs default to create compressed archives.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-11 14:19:04 -07:00
Michael Crosby
fa3454e54d
Update go-runc to b85ac701de5065a66918203dd18f05
...
This includes fixes for pipe ownership and NullIO options.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-11 17:15:25 -04:00
Derek McGowan
dee8dc2cda
Add support for content labels on commit
...
Add commit options which allow for setting labels on commit.
Prevents potential race between garbage collector reading labels
after commit and labels getting set.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-11 14:15:20 -07:00
Derek McGowan
c4387a159e
Add content test suite run to client
...
Fix bugs in content deletion and upload status
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-11 14:08:34 -07:00
Michael Crosby
b1eb1103a8
Add section for state
dir
...
Closes #1286
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-11 16:54:42 -04:00
Phil Estes
edc51c86f2
Merge pull request #1342 from mlaventure/is-serving-failfast
...
Disable FailFast on client.IsServing()
2017-08-11 16:47:48 -04:00
Michael Crosby
f2ee71c56c
Merge pull request #1339 from dmcgowan/refactor-oci-package
...
Remove oci package
2017-08-11 16:32:42 -04:00
Kenfe-Mickael Laventure
fed5ad4bc5
Update tests to properly use IsServing
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 13:13:13 -07:00
Kenfe-Mickael Laventure
7de9ca519c
Disable FailFast on client.IsServing()
...
User of the client should associate a proper timeout with the context
instead.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 13:13:13 -07:00
Christopher Jones
661bcd3e4d
Change test image based on platform
...
This changes testImage so it can be run on other platforms.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-08-11 14:48:14 -04:00
Derek McGowan
a437d140f8
Remove oci package
...
Replace functionality in client with simple tar writer
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-11 11:48:14 -07:00
Phil Estes
a6be9f544d
Merge pull request #1338 from mlaventure/client-reconnect-fix
...
Client reconnect fix
2017-08-11 14:30:05 -04:00
Kenfe-Mickael Laventure
5f36ac2093
Add test to ensure we can access tasks on restart
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
e661be6a9c
Fix failure to connect to shim on daemon restart
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
7ac351cdfe
Share Dialer and DialAddress between client and shim
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
587a811d09
Check credentials when connecting to shim
...
NewUnixSocketCredentials was actually never invoked before.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 09:34:29 -07:00
Kenfe-Mickael Laventure
24aac336f3
Update unix dialer to keep retrying if socket is gone
...
This is needed to support daemon restart as the unix socket is recreated at
every start.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-11 09:34:15 -07:00
Michael Crosby
bb4432412f
Merge pull request #1331 from crosbymichael/stress
...
Add stress test tool
2017-08-11 11:21:44 -04:00
Michael Crosby
f27f8dd120
Merge pull request #1320 from crosbymichael/cr-race
...
Fix race with task checkpoint
2017-08-11 10:30:51 -04:00
Michael Crosby
c7f04ce0de
Merge pull request #1310 from stevvooe/releases
...
RELEASES: define the release process
2017-08-11 10:28:37 -04:00
Stephen J Day
9827b4c1e5
RELEASES: define the release process
...
Define the release process for containerd and outline the components
that are and are not covered by versioning guarantees. Please read the
document for details.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-10 18:27:07 -07:00
Stephen Day
56d499e114
Merge pull request #1335 from stevvooe/alpha4
...
release: prepare for 1.0.0-alpha4
2017-08-10 15:18:14 -07:00
Stephen J Day
875672ef86
release: prepare for 1.0.0-alpha4
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-10 15:04:17 -07:00
Michael Crosby
d513dd2bfd
Fix race with task checkpoint
...
Because runc will delete a container after a successful checkpoint we
need to handle a NotFound error from runc on delete.
There is also a race between SIGKILL'ing the shim and it actually
exiting to unmount the tasks rootfs, we need to loop and wait for the
task to actually be reaped before trying to delete the rootfs+bundle.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-10 16:35:03 -04:00
Michael Crosby
fd75f1e52f
Add stress test tool
...
This adds a `stress` binary to help stress test containerd. It is
different from a benchmarking tool as it only gives a simple summary at
the end.
It is built to run long, multi hour/day stress tests across builds of
containerd.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-10 15:46:10 -04:00
Derek McGowan
70c2d367db
Merge pull request #1328 from crosbymichael/ctr-runtime
...
Set runtime on container from ctr
2017-08-10 11:22:35 -07:00
Michael Crosby
a888587cc4
Set runtime on container from ctr
...
Set the missing `--runtime` flag when using ctr for new containers
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-10 11:38:36 -04:00
Kenfe-Mickaël Laventure
258c719cbc
Merge pull request #1327 from estesp/namespace-doc-fixes
...
Minor updates to the namespaces doc
2017-08-10 17:25:50 +02:00
Phil Estes
f90fa4e121
Minor updates to the namespaces doc
...
Add info on labels. Some wording updates.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-08-10 11:08:03 -04:00