vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity
842 commits 2 branches 0 tags 33 MiB
Commit graph

842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
6f18acda73 Remove dep on larger packages 
This removes most of the deps on the larger packages for the shim and
reduces the binary size and memory footprint from a 7.1mb binary to a
2.6mb binary.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-06 11:21:49 -07:00
mYmNeo
4eb27a5926 let user to specify the shim name or path 
Signed-off-by: mYmNeo <thomassong@tencent.com>
 2016-04-06 14:42:47 +08:00
Lei Jitang
6299489d03 move epoll syscall to arch specific to enable containerd run on arm64 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-04-05 23:17:30 -04:00
Michael Crosby
5e5daf2b33 Merge pull request #168 from docker/timeout 
Add timeout flag for container start times
 2016-04-05 15:04:39 -07:00
Michael Crosby
ae107f688e Change sleep to 15ms 
This is currently the optimal value for this setting based on runc start
times.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-05 14:07:26 -07:00
Michael Crosby
3742ae3ec8 Add timeout flag for container start times 
This currently depends on a runc PR:

https://github.com/opencontainers/runc/pull/703

We need this pr because we have to SIGKILL runc and the container root
dir will still be left around.

As for the containerd changes this adds a flag to containerd so that you
can configure the timeout without any more code changes.  It also adds
better handling in the error cases and will kill the containerd-shim and
runc ( as well as the user process if it exists ) if the timeout is hit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-05 13:38:49 -07:00
Alexander Morozov
9416996835 api: fix pprof-address usage 
those handlers already added by init functions

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-04-05 11:36:51 -07:00
Michael Crosby
604c8d7832 Merge pull request #170 from cyphar/add-pids-stats-limit 
api: grpc: add Limit to PidsStats
 2016-04-04 13:25:34 -07:00
Michael Crosby
a3ea64a713 Merge pull request #180 from mlaventure/pause-resume-test 
Add test for pause/resume commands
 2016-04-04 11:56:57 -07:00
Kenfe-Mickael Laventure
1a1d6a96f5 Add test for pause/resume commands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-04-04 11:10:32 -07:00
Michael Crosby
96034177f9 Merge pull request #183 from tianon/deferred 
Fix minor "deferred" typo
 2016-04-04 10:27:24 -07:00
Aleksa Sarai
696cb97c28 api: grpc: add Limit to PidsStats 
This will be filled by the value of pids.max, allowing clients to render
usage statistics for PIDs in a container.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-05 01:47:32 +10:00
Tianon Gravi
13f03c3f7a Fix minor "deferred" typo 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-04-02 10:28:05 -07:00
Michael Crosby
cb3c208a4d Merge pull request #172 from mlaventure/better-error-for-pause-and-resume 
Return the runtime error message on failed pause and resume calls
 2016-04-01 14:25:52 -07:00
Michael Crosby
bf20ebc4a0 Merge pull request #181 from mlaventure/non-fatal-sig-test 
Add test checking that non fatal signals are correctly handled
 2016-04-01 13:25:13 -07:00
Michael Crosby
31697e9172 Merge pull request #182 from mlaventure/exec-output 
Add test for exec'ing new process in existing container
 2016-04-01 13:24:43 -07:00
Kenfe-Mickael Laventure
22fabf733c Add test for events order when killing container with exec process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-31 14:01:56 -07:00
Kenfe-Mickael Laventure
a7f27b8fb9 Add test for killing a long lived exec process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-31 13:59:00 -07:00
Kenfe-Mickael Laventure
7117935db4 Add test for exec'ing new process in existing container 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-31 13:55:11 -07:00
Kenfe-Mickael Laventure
92c72dc5e9 Add test checking that non fatal signals are correctly handled 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-31 12:08:40 -07:00
Michael Crosby
dd9c474c6c Merge pull request #176 from mlaventure/top-kill-test 
Add test for the kill/signal operations
 2016-03-31 11:47:25 -07:00
Tõnis Tiigi
07c95162cd Merge pull request #174 from docker/no-pivot 
Add no pivot root support
 2016-03-30 21:57:24 -07:00
Michael Crosby
47f239706c Add no pivot root support 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-03-30 21:52:15 -07:00
Kenfe-Mickael Laventure
0228e25fa4 Add test for the kill/signal operations 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-30 15:15:33 -07:00
Michael Crosby
2f7c21ed5b Merge pull request #175 from mlaventure/top-test-update 
Update busybox top to check validity of running container list
 2016-03-30 15:13:31 -07:00
Kenfe-Mickael Laventure
a75c94a195 Update busybox top to check validity of running container list 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-30 15:08:20 -07:00
Michael Crosby
d9c2b13dbc Merge pull request #171 from mlaventure/sleep-test 
Sleep test
 2016-03-30 15:07:17 -07:00
Kenfe-Mickael Laventure
fd888e8f34 Return the runtime error message on failed pause and resume calls 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 11:40:05 -07:00
Kenfe-Mickael Laventure
9455c01bc4 Add a test checking container life duration 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:47:51 -07:00
Kenfe-Mickael Laventure
203651e774 Allow tests to specify their own events filter routine 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:47:51 -07:00
Michael Crosby
aa976325f5 Merge pull request #169 from mlaventure/fix-runtime-root 
Ensure that --root is passed to oci when using runtime args
 2016-03-29 10:45:12 -07:00
Kenfe-Mickael Laventure
f07c5ac52a Ensure that runtimeArgs always get passed down to the oci runtime 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-29 10:32:37 -07:00
Michael Crosby
5b0a213766 Merge pull request #167 from mlaventure/containers-life-events-test 
Containers life events test
 2016-03-28 17:01:50 -07:00
Kenfe-Mickael Laventure
90009c8a31 Add a test checking a ls container generated events 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
3481996e9d Add a way to retrieve a test container event channel 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
e6b2ed4b7f Wait maximum 3s per container kill when tearing down a test 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:21 -07:00
Kenfe-Mickael Laventure
20ee648540 Add per test and suite timeout values to Makefile 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 11:35:16 -07:00
Kenfe-Mickael Laventure
bf20f56615 Rename busybox-NoSuchFile test bundle to busybox-no-such-file 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:40:33 -07:00
Michael Crosby
dec6a0dc4d Merge pull request #166 from mlaventure/add-grpc-timeout 
Add grpc timeout
 2016-03-28 10:23:51 -07:00
Kenfe-Mickael Laventure
4ecebc4e0f Add timeout option for GRPC connection 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:09:40 -07:00
Kenfe-Mickael Laventure
6ba0e0fc44 Add integration-test/test-artifacts to .gitignore 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-28 10:09:16 -07:00
Michael Crosby
3d72dc1e4e Merge pull request #161 from calavera/enable_pprof 
Enable http pprof connections when pprof-address flag is set
 2016-03-25 17:27:08 -07:00
Arnaud Porterie
53cfb9dfbe Merge pull request #160 from mlaventure/integration-test 
Integration test
 2016-03-25 16:25:29 -07:00
David Calavera
06bcd7d03c Enable http pprof connections when pprof-address is set. 
Add flag to specify the address where those connections listen.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-25 17:46:10 -04:00
Kenfe-Mickael Laventure
cb69ab45ee Add initial integration tests framework 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 12:08:51 -07:00
Kenfe-Mickael Laventure
9992d2e1bd Vendor go-check in 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:48 -07:00
Kenfe-Mickael Laventure
3f388f8638 Take runtimeArgs in account when loading containers state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
bac78851e0 Append error message to internal errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
e500586d8f Disable metrics if interval is less or equal to 0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00
Kenfe-Mickael Laventure
4796ec8d9d Build containerd binaries within the container 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-25 11:03:11 -07:00