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

430 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleksa Sarai
f88d701233 containerd: use docker/listeners to create the GRPC socket 
This allows for the use of socket activation with the flag `-l fd://`
and similar. The semantics are identical to Docker, but it's important
to note that the semantics of the --listen flag have changed to require
a proto://addr formatted string.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-23 02:20:46 +10:00
Aleksa Sarai
20ef099321 vendor: pull in requirements for docker/pkg/listeners 
Since we're using the docker "library" for socket activation (and
dealing with sockets in general), we need to vendor the requirements for
the library. Also, include go-winio even though Windows isn't a
supported target at the moment.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-23 02:17:25 +10:00
Kenfe-Mickaël Laventure
e8b33495f2 Merge pull request #213 from crosbymichael/bump-runc 
Bump runc to e87436998478d222be209707503c27f6f91be
 2016-04-22 10:59:04 +10:00
Michael Crosby
d7fb9f0538 Bump runc to e87436998478d222be209707503c27f6f91be 
Fixes for cgroup memory updates and process labeling.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-21 17:49:52 -07:00
Michael Crosby
c0295fac04 Merge pull request #210 from WeiZhang555/event-types-constant 
Move event types constants into single file
 2016-04-21 10:24:54 -07:00
Michael Crosby
a8dd154da1 Merge pull request #212 from mlaventure/test-containerd-restart 
Test containerd restart
 2016-04-21 10:24:31 -07:00
Michael Crosby
6a33c8a49b Merge pull request #209 from crosbymichael/event-path 
Set fixed event log size
 2016-04-21 10:23:37 -07:00
Kenfe-Mickael Laventure
4dbc495ff8 Add containerd restore test 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-04-20 18:08:36 -07:00
Kenfe-Mickael Laventure
7b2491bccc Use nanosecond timing for daemon log 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-04-20 18:08:23 -07:00
Michael Crosby
1b8cc65462 Set fixed event log size 
Truncate the event log on disk and in memory so that it does not
grow forever.  This is mainly used for higher levels to receive past
events if they miss any.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-20 15:07:49 -07:00
Kenfe-Mickaël Laventure
b31b8a611e Merge pull request #157 from mYmNeo/binary-path 
let user to specify the shim name or path
 2016-04-21 00:31:14 +10:00
Zhang Wei
e213e2eb62 Move event types constants into single file 
Move all constants for event types to types.go for easier code
readability and maintainance.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-04-19 19:09:54 +08:00
Michael Crosby
63001ee20d Merge pull request #185 from LK4D4/fix_pprof_address 
api: fix pprof-address usage
 2016-04-18 11:01:31 -07:00
Michael Crosby
4e54940c10 Merge pull request #195 from cyphar/fix-c-formatting-epoll-arm64 
archutils: aarch64: fix build and improve C formatting
 2016-04-18 10:54:15 -07:00
Michael Crosby
2239d4e329 Merge pull request #204 from mlaventure/checkpoint-error-output 
Return runtime output on checkpoint operation errors
 2016-04-18 10:53:15 -07:00
Michael Crosby
e49fcf514e Merge pull request #207 from WeiZhang555/provide-help 
Provide more useful help information for ctr
 2016-04-18 10:52:47 -07:00
Michael Crosby
31987990db Merge pull request #202 from crosbymichael/trunc-events 
Truncate events log after read
 2016-04-18 10:51:13 -07:00
Zhang Wei
59720469ac Provide more useful help information for ctr 
`ctr containers/checkpoints` contains lots of important subcommands,
but now help command can't show subcommands. Adding subcommands to
help information will avoid user from digging into the code for
getting necessary command list.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-04-18 15:32:46 +08:00
Kenfe-Mickael Laventure
07646a7150 Return runtime output on checkpoint operation errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-04-17 12:01:19 -07:00
Aleksa Sarai
7c572f1673 archutils: fix build on aarch64 
Due to an invalid architecture name (arm64), containerd could not build
on aarch64 machines. Fix this by using the correct name of the
architecture for conditional building.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-17 12:38:05 +10:00
Aleksa Sarai
1e617aaab4 archutils: epoll_aarch64: fix C formatting 
Use proper C formatting to make the cgo code much easier to read. Also
remove the pointless typedef.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-04-17 12:38:05 +10:00
Michael Crosby
21364997bb Merge pull request #192 from hqhq/hq_epool_flag 
Use flag for aarch64 EpollCreate1
 2016-04-15 13:56:32 -07:00
Michael Crosby
4ae5413ed7 Truncate events log after read 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-15 13:48:02 -07:00
Michael Crosby
399eca2b90 Bump to version 0.2.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-14 14:28:13 -07:00
Michael Crosby
a50d45d4aa Merge pull request #198 from ah3rz/patch-3 
Changed Containerd to containerd for consistency
 2016-04-13 17:35:22 -07:00
Adam Herzog
915bbfd8b8 Changed Containerd to containerd for consistency 
Signed-off-by: Adam Herzog <adam@docker.com>
 2016-04-13 17:19:01 -07:00
Tõnis Tiigi
10e3a6f9b5 Merge pull request #194 from coolljt0725/fix_epoll 
Rename epoll_amd64.go to epoll.go
 2016-04-12 22:58:30 -07:00
Lei Jitang
6f8b5c2a39 Rename epoll_amd64.go to epoll.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-04-13 02:02:40 -04:00
Qiang Huang
e419be223f Use flag for aarch64 EpollCreate1 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-04-11 15:01:36 +08:00
Michael Crosby
389483d83f Merge pull request #189 from docker/oom 
Error oom if container has not stopped
 2016-04-07 10:46:35 -07:00
Michael Crosby
28f9453fbb Error oom if container has not stopped 
The oom control file may not exist if the container is short lived and
exits before we can open it.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-07 10:44:36 -07:00
Michael Crosby
1bb6821084 Merge pull request #191 from docker/vet 
Remove govet
 2016-04-07 10:44:19 -07:00
Michael Crosby
8dbbb0fa05 Remove govet 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-04-07 10:40:09 -07:00
Michael Crosby
d34c458529 Merge pull request #186 from coolljt0725/arm64_epoll 
move epoll syscall to arch specific to enable containerd run on arm64
 2016-04-06 17:19:22 -07:00
Michael Crosby
381e32537a Merge pull request #187 from bfirsh/update-readme 
Improve readme & docs
 2016-04-06 17:16:12 -07:00
Ben Firshman
258d002131 Move sign off instructions to CONTRIBUTING.md 
Will show up in GitHub when creating a PR.

https://github.com/blog/1184-contributing-guidelines

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-06 14:14:51 -07:00
Ben Firshman
6228054b6f Move docs in readme to separate pages 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-06 14:14:51 -07:00
Ben Firshman
a3d09df648 Add getting started section to readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-06 14:14:51 -07:00
Tõnis Tiigi
d2f03861c9 Merge pull request #184 from docker/shim-size 
Remove dep on larger packages
 2016-04-06 13:01:52 -07:00
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