github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
3,069 Commits 3 Branches 2 Tags 112 MiB
00bc24fcea
Commit Graph

597 Commits

Author SHA1 Message Date
Phil Estes
7c37625af4
Merge pull request #1914 from stevvooe/stabilize-snapshot-tree-output 
cmd/ctr: stablize output of snapshot tree
 2017-12-15 12:22:26 -05:00
Akihiro Suda
fad72b6ae4
Merge pull request #1910 from crosbymichael/stress-json 
Add metrics endpoint to stress test tool
 2017-12-15 19:00:17 +09:00
Michael Crosby
6ae0f5f7e2 Add error metric for stress tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-13 13:15:07 -05:00
Stephen J Day
9aeeefae55
cmd/ctr: stablize output of snapshot tree 
Preserves the order of the tree output between each execution. Slightly
refactored the behavior to be more "object oriented".

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-12 14:50:05 -08:00
Michael Crosby
652e078078 Add commit to stress metric 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-12 14:14:39 -05:00
Michael Crosby
4d55298aab Add prom timer to stress 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-12 14:05:14 -05:00
Lantao Liu
0eebf9051b Fix containerd deadlock. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-12 01:45:14 +00:00
Michael Crosby
ca5f16c33e Move stress worker to new file 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-11 10:36:19 -05:00
Michael Crosby
9fcca96771 Add json output to stress test tool 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-11 10:33:55 -05:00
Stephen J Day
4d5c2860d2
release: prepare 1.0.0 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-04 21:14:02 -08:00
Derek McGowan
40c67fdf78
Merge pull request #1880 from AkihiroSuda/refactor-importer 
importer: refactor and fix GC
 2017-12-04 20:56:26 -08:00
Akihiro Suda
63401970c7 importer: refactor 
- Use lease API (previoisly, GC was not supported)
- Refactored interfaces for ease of future Docker v1 importer support

For usage, please refer to `ctr images import --help`.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-12-05 12:48:32 +09:00
Stephen Day
53c892d796
Merge pull request #1856 from crosbymichael/mountns 
Remove mount namespace from shim
 2017-12-01 16:01:44 -08:00
Michael Crosby
fd2e3cd326 Remove mount namespace from shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-12-01 17:35:14 -05:00
Stephen J Day
1710fe9b95
cmd/ctr: move log messages to debug 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-12-01 13:57:54 -08: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
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
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
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
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
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
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
Michael Crosby
6e9f24b711 Change default subreaper setting 
This subreaper should always be turned on for containerd unless
explicitly needed for it to be off.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-28 17:04:21 -05:00
Michael Crosby
74b3cb3391 Fix exit event handling in shim 
Could issues where when exec processes fail the wait block is not
released.

Second, you could not dump stacks if the reaper loop locks up.

Third, the publisher was not waiting on the correct pid.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-28 14:32:06 -05:00
Michael Crosby
723f37d846 Add exec support to stress test tool 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-28 14:18:58 -05:00
Phil Estes
2556c594ec
Merge pull request #1767 from stevvooe/ttrpc-shim 
linux/shim: reduce memory overhead by using ttrpc
 2017-11-28 12:43:41 -05:00
Michael Crosby
ca39f76f82
Merge pull request #1798 from stevvooe/shim-gomaxprocs 
cmd/containerd-shim: set GOMAXPROCS to 2
 2017-11-28 09:55:31 -05:00
Stephen Day
372cdfac3b
Merge pull request #1638 from dmcgowan/gc-policy 
gc: add policy plugin
 2017-11-27 18:20:10 -08:00
Stephen J Day
5764bf1bad
cmd/containerd-shim: set GOMAXPROCS to 2 
The shim doesn't need massive concurrency and a bunch of CPUs to do its
job correctly. We can reduce the number of threads to save memory at
little cost to performance.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-27 13:40:35 -08:00
Daniel Nephin
cdf62f69a1 Fix usage of oci in other packages. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-27 16:16:17 -05:00
Michael Crosby
1cb0e81b5a Fix race in stress test tool 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-27 10:55:13 -05:00
Daniel Nephin
0103d14b47 Fix ctr events 
add import to register event types with grpc

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-24 14:28:44 -05:00
Stephen J Day
e8f52c35ce
linux/shim: reduce memory overhead by using ttrpc 
By replacing grpc with ttrpc, we can reduce total memory runtime
requirements and binary size. With minimal code changes, the shim can
now be controlled by the much lightweight protocol, reducing the total
memory required per container.

When reviewing this change, take particular notice of the generated shim
code.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-22 12:21:48 -08:00
Daniel Nephin
f74862a0dd Add structcheck, unused, and varcheck linters. 
Warn on unused and dead code

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-21 11:14:37 -05:00
Derek McGowan
3f1a61f76a
Add synchronous image delete 
Synchronous image delete provides an option image delete to wait
until the next garbage collection deletes after an image is removed
before returning success to the caller.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-20 17:08:35 -08:00
Derek McGowan
00596f400e
Add gc policy plugin 
Add garbage collection as a background process and policy
configuration for configuring when to run garbage collection.
By default garbage collection will run when deletion occurs
and no more than 20ms out of every second.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-20 16:57:39 -08:00
Michael Crosby
67232e93dc
Merge pull request #1779 from AkihiroSuda/resolve-util-bin 
shim: support non-default binary name
 2017-11-17 17:53:43 -05:00
Akihiro Suda
7ef4aa5c25 shim: support non-default binary name 
The binary name used for executing "containerd publish" was hard-coded
in the shim code, and hence it did not work with customized daemon
binary name. (e.g. `docker-containerd`)

This commit allows specifying custom daemon binary via `containerd-shim
-containerd-binary ...`.
The daemon invokes this command with `os.Executable()` path.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-11-17 22:21:54 +00:00
Daniel Nephin
298dabc6c2 Move io.go into cio package 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-17 17:04:45 -05:00
Stephen J Day
c5022ad92d
protobuf: use the gogo/types package for empty 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-15 19:08:54 -08:00
Michael Crosby
a522a6c7ee Add publish subcommand for publishing events 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-15 11:30:03 -05:00
Stephen Day
571c002ef6
Merge pull request #1755 from AkihiroSuda/fix-ctr-snapshot-args 
ctr: fix args
 2017-11-14 17:55:14 -08:00
Akihiro Suda
5eff92d1ba ctr: fix args 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-11-15 01:34:12 +00:00
Phil Estes
37ee054e61
Merge pull request #1739 from crosbymichael/shim-redux 
Move shim process code into subpackage
 2017-11-14 10:20:28 -05:00
Stephen Day
f9933e9f96
Merge pull request #1742 from jessvalarezo/ctr-task-kill 
ctr: update task kill to take exec-id
 2017-11-13 13:53:26 -08:00
Michael Crosby
1fe5a251c4 Move Exec creation to init process 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-13 16:45:25 -05:00
Michael Crosby
92ca22c997
Merge pull request #1735 from estesp/image-rm-feedback 
Fix output on ctr images rm to show actual feedback
 2017-11-13 14:18:12 -05:00