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

2389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickaël Laventure
e1eeb0e0a2 Merge pull request #1475 from dmcgowan/content-commit-context 
Add context to content commit
 2017-09-06 11:04:31 -07:00
Derek McGowan
9613acb2ed
Add context to content commit 
Content commit is updated to take in a context, allowing
content to be committed within the same context the writer
was in. This is useful when commit may be able to use more
context to complete the action rather than creating its own.
An example of this being useful is for the metadata implementation
of content, having a context allows tests to fully create
content in one database transaction by making use of the context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-06 10:19:12 -07:00
Michael Crosby
bf08f7cd08 Merge pull request #1474 from mlaventure/update-gorunc 
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359
 2017-09-06 11:16:23 -04:00
Kenfe-Mickael Laventure
f766801a99
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359 
This fixes an issue with Exec not returning a proper error

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-06 08:09:09 -07:00
Kenfe-Mickaël Laventure
026ebe145c Merge pull request #1472 from dmcgowan/fix-gcr-registries 
remotes/docker: expand allowed status codes on push
 2017-09-05 15:28:16 -07:00
Derek McGowan
48afd44514
Support blob commit returning a 200 instead of 201 
Support registries returning 204 or 200 in place of 201/202.
Ensure body is closed when request is retried.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-09-05 15:02:21 -07:00
Phil Estes
16fcb8dc08 Merge pull request #1470 from crosbymichael/lossy 
Return grpc errs from task service
 2017-09-05 17:15:38 -04:00
Derek McGowan
a6aa3ccd07 Merge pull request #1469 from crosbymichael/sys 
Update golang/sys to 7ddbeae9ae08c6a06a59597f0c9ed
 2017-09-05 14:14:21 -07:00
Michael Crosby
f5d81a631e Return grpc errs from task service 
Closes #1201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 16:10:19 -04:00
Derek McGowan
887f97f2ff Merge pull request #1463 from stevvooe/switch-snapshot-kind 
snapshot: use switch to parse snapshot.Kind
 2017-09-05 12:44:57 -07:00
Michael Crosby
f7dc0ab9e1 Update golang/sys to 7ddbeae9ae08c6a06a59597f0c9ed 
ref #1422

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-05 15:39:46 -04:00
Stephen J Day
1c31199797
snapshot: use switch to parse snapshot.Kind 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-05 11:04:15 -07:00
Michael Crosby
f4b84987c7 Merge pull request #1373 from AkihiroSuda/fix-snapshot-view 
mount: fix read-only bind
 2017-09-05 10:29:19 -04:00
Akihiro Suda
a560e5e0ef mount: fix read-only bind (#1368) 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-04 04:44:56 +00:00
Kenfe-Mickaël Laventure
b4cc42d028 Merge pull request #1460 from mlaventure/pid-host-kill-init 
Ensure all init children are dead when it exits
 2017-09-01 15:17:40 -07:00
Kenfe-Mickael Laventure
939ad32117
Update go-runc to ba22f6a82e52be3be4eb4a00000fe816f4b41c2e 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
a6fb9bc111
reaper: Return an error if exit status is not 0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
92772bd471
linux: Ensure all init children are dead when it exits 
This ensure that when using the host pid, we don't let process alive,
preventing Wait() to return until they all die.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickael Laventure
9d251cbd1b
Delete bundle dir on restore if we're not debugging the shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-09-01 14:50:56 -07:00
Kenfe-Mickaël Laventure
d3e1132588 Merge pull request #1453 from crosbymichael/oom 
Convert oom metric to const
 2017-09-01 14:45:46 -07:00
Stephen Day
378e3343fe Merge pull request #1362 from AkihiroSuda/ctr-snapshot-info 
ctr: add `ctr snapshot info <key>`
 2017-09-01 14:25:25 -07:00
Michael Crosby
b04e408a4b Convert OOM Metric to Const 
This converts the oom metric to be a const metric so that deleted tasks
do not fill up the metric labels.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-01 16:43:30 -04:00
Michael Crosby
93395c0b1d Merge pull request #1462 from stevvooe/fieldpath-fix 
service/containers: correctly plumb fieldpaths
 2017-09-01 16:30:57 -04:00
Stephen J Day
5cc108605f
service/containers: correctly plumb fieldpaths 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-01 13:17:31 -07:00
Derek McGowan
7182085551 Merge pull request #1447 from stevvooe/nice-events 
containerd: export Subscribe method on client
 2017-09-01 11:42:49 -07:00
Phil Estes
4291fb4803 Merge pull request #1454 from mlaventure/per-container-runtime-binary 
Per container runtime binary
 2017-09-01 13:25:17 -04:00
Phil Estes
a3f0bbaac1 Merge pull request #1459 from crosbymichael/exec-wait 
Wait on exec process not task
 2017-09-01 12:12:28 -04:00
Michael Crosby
5614e9c7b3 Wait on exec process not task 
Fixes #1449

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-09-01 11:51:45 -04:00
Michael Crosby
3e2a9c60af Merge pull request #1458 from AkihiroSuda/net-host 
ctr: net-host: bind-mount host /etc/{hosts,resolv.conf}
 2017-09-01 10:28:17 -04:00
Phil Estes
dd05301bef Merge pull request #1457 from AkihiroSuda/nit-doc 
RELEASES.md: Go API -> Go client API
 2017-09-01 10:00:23 -04:00
Akihiro Suda
053deb5ce2 ctr: net-host: bind-mount host /etc/{hosts,resolv.conf} 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-01 07:16:31 +00:00
Akihiro Suda
37896edfed RELEASES.md: Go API -> Go client API 
So as to make sure the Go plugin API is not in the scope

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-01 07:05:35 +00:00
Akihiro Suda
525bffd194 snapshot: support JSON marshalling for Info 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-01 04:47:35 +00:00
Akihiro Suda
fef7f3addc ctr: add ctr snapshot info <key> 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-09-01 04:41:34 +00:00
Kenfe-Mickael Laventure
1b79170849
linux: Add RuntimeRoot to RuncOptions 
This allow specifying wher the OCI runtime should store its state data.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-31 14:35:05 -07:00
Kenfe-Mickael Laventure
ab0cb4e756
linux: Honor RuncOptions if set on container 
This also fix the type used for RuncOptions.SystemCgroup, hence introducing
an API break.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-31 14:35:05 -07:00
Kenfe-Mickael Laventure
e0d8cb1366
Fix retrieval of container Runtime.Options field 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-31 12:05:39 -07:00
Kenfe-Mickaël Laventure
22df20b35f Merge pull request #1452 from crosbymichael/reaper2 
Update reaper for multiple subscribers
 2017-08-31 11:52:23 -07:00
Michael Crosby
6b4c4a2937 Update reaper for multipe subscribers 
Depends on https://github.com/containerd/go-runc/pull/24

The is currently a race with the reaper where you could miss some exit
events from processes.

The problem before and why the reaper was so complex was because
processes could fork, getting a pid, and then fail on an execve before
we would have time to register the process with the reaper.  This could
cause pids to fill up in a map as a way to reduce the race.

This changes makes the reaper handle multiple subscribers so that the
caller can handle locking, for when they want to wait for a specific
pid, without affecting other callers using the reaper code.

Exit events are broadcast to multiple subscribers, in the case, the runc
commands and container pids that we get from a pid-file.  Locking while
the entire container stats no longs affects runc commands where you want
to call `runc create` and wait until that has been completed.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-31 14:29:47 -04:00
Stephen J Day
9255e752b3
containerd: export Subscribe method on client 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-08-31 11:14:03 -07:00
Phil Estes
c2e894c33a Merge pull request #1448 from darrenstahlmsft/ConsoleSize 
Ensure ConsoleSize is not nil
 2017-08-31 08:49:45 -04:00
Stephen Day
c1c2aafffe Merge pull request #1444 from Random-Liu/add-image-config 
Add image config function.
 2017-08-30 17:27:23 -07:00
Darren Stahl
04c6bf42e2 Ensure ConsoleSize is not nil 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-08-30 16:34:20 -07:00
Lantao Liu
76e016ca30 Add image config function. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-30 23:02:43 +00:00
Phil Estes
0baecaa7cf Merge pull request #1439 from mlaventure/allow-setting-rutime-opts 
Allow setting runtime options when using WithRuntime()
 2017-08-30 15:59:14 -04:00
Kenfe-Mickaël Laventure
49e3d43ff2 Merge pull request #1443 from crosbymichael/daemon-cgroup 
Place containerd inside cgroup
 2017-08-30 10:45:19 -07:00
Michael Crosby
932246b575 Place containerd inside cgroup 
This adds a config option to place the `containerd` daemon process into
a cgroup so that proper resource usage and accounting can be applied.

It defaults to not being place inside a cgroup and will create a new
cgroup if the `path` does not exist in the config or join an existing
`path` if it already exists.

```toml
[cgroup]
    path = "/containerd"
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-29 15:00:27 -04:00
Michael Crosby
c3711c3866 Merge pull request #1319 from mlaventure/handle-sigkilled-shim 
Handle sigkilled shim
 2017-08-29 14:06:17 -04:00
Michael Crosby
744308a952 Merge pull request #1440 from mlaventure/fix-shim-panic 
Fix panic in CloseIO when not Stdin was allocated for a process
 2017-08-29 13:33:05 -04:00
Kenfe-Mickael Laventure
42b131c1f3
Allow setting runtime options when using WithRuntime() 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 10:03:51 -07:00