Commit Graph

102 Commits

Author SHA1 Message Date
Michael Crosby
781ce658c8 Update console dep to b28c739c79ce69d017e3691ad366
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-20 11:16:56 -04:00
Michael Crosby
d22160c28e Vendor typeurl package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-19 09:43:55 -04:00
Michael Crosby
77f699ccc7 Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
This bumps runc to the newest version as of this date.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 14:24:24 -04:00
Kenfe-Mickaël Laventure
e66d1a7961 Merge pull request #1468 from crosbymichael/stats
Add Metrics endpoint to tasks
2017-09-06 14:59:55 -07:00
Michael Crosby
2ed3c62e27 Update cgroups to 5933ab4dc4f7caa3a73a1dc141bd11f4
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-06 16:20:19 -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
Michael Crosby
f45269be6b Update cgroups to 4be134fe43b9e207558365ad2675546b
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-05 17:26:26 -04:00
Michael Crosby
0973a084cf Update cgroups to e364e5d4183340acdf51f943ba033543
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-05 17:26:26 -04: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
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
Darren Stahl
4a782f7b54 Vendor opengcs and hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-08-28 15:07:51 -07:00
Michael Crosby
5c7f67186a Add libcontainer/user package for passwd parsing
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 10:32:16 -04:00
Michael Crosby
77836a6c27 Update cgroups to e6d1aa8c71c6103624b2c6e6f4be0863
This bumps the cgroups package with various fixes to logging and net_cls
changes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-21 16:17:18 -04:00
Derek McGowan
0e28f2c76e
Update mount creation to only use btrfs subvolume id
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-16 13:00:54 -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
Edward Pilatowicz
534a137ed3 vendor: update github.com/containerd/console
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-02 17:25:29 -07:00
Edward Pilatowicz
47637f2aa2 vendor: update github.com/containerd/continuity
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-02 17:22:33 -07:00
Stephen J Day
610e1a250d
vendor: update OCI image-spec dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-02 14:08:13 -07:00
Stephen Day
92d737f4ae Merge pull request #1259 from dqminh/epoll-io
Use Epoll to perform I/O in linux
2017-07-31 13:47:41 -07:00
Michael Crosby
2386062ce1 Update runc to e775f0fba3ea329b8b766451c892c41a3d4
This resolves logrus issues with containerd not being in sync with the
version runc is using.

This also updates the OCI runtime spec to v1.0.0

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-31 14:33:49 -04:00
Daniel Dao
de2671b7f5
bump vendor for containerd/console update
Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2017-07-28 12:23:49 +01:00
Darren Stahl
cec6331e4b Revendor hcsshim and go-winio
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-07-25 12:03:44 -07:00
Derek McGowan
1491293260
Update dependencies for logrus rename
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-21 16:14:03 -07:00
Andrew Pennebaker
1d2a079f08
update to github.com/sirupsen/logrus v1.0.0
Signed-off-by: Andrew Pennebaker <apennebaker@datapipe.com>
2017-07-21 15:39:14 -07:00
Kenfe-Mickael Laventure
4d14bfd8ad
go-winio: Don't increment the wait count if the file is closing
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
7f786cf075
go-winio: Prevent Data Race when accessing closing
The race usually happens when `closeHandle()` and `prepareIo()` are called
concurrently; the former tries to set `closing` to `true` the latter tries
to read its value.

In order to avoid this issue, we added a lock around the variable.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
db1b0a2a5a
Update go-winio to v0.4.3
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
5fd004a1c0
Update vendoring
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
fc82e149ba
windows: Move runtime options out of the spec field
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-20 17:22:59 +02:00
Stephen Day
28e8d95a64 Merge pull request #1210 from dmcgowan/use-forked-tar
Use forked archive/tar package for go 1.8 regression
2017-07-19 15:34:55 -07:00
Derek McGowan
23aa4910c0
Use forked archive/tar package
Use fork of archive/tar to carry changes to tar for
all go versions.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-18 18:32:44 -07:00
Phil Estes
5e594d035d
Update containerd/fifo for race fix
Re-vendor containerd/fifo to pick up PR #13 to fix data race.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-07-14 15:42:44 -04:00
Michael Crosby
83a38c2cec Update runtime spec to 96de01bbb42c7af89bff100e10a
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 16:29:23 -07:00
Michael Crosby
4e8943f7bb Update runtime-spec rc6
This should be the same commit tagged as the 1.0 release

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 09:32:41 -07:00
Ian Campbell
412d455374 Rerun vndr with newest version
This excludes things marked with "// +build ignore".

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-12 11:01:45 +01:00
Michael Crosby
d46b562043 Update containerd dependencies
sys/unix
cgroups
go-runc
console

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-10 11:05:51 -07:00
Michael Crosby
49f9dc494f Update runc and runtime-spec dependencies
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-27 11:44:38 -07:00
Evan Hazlett
935645b03a events: add protos
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: update events package to include emitter and use envelope proto

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: add events service

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: enable events service and update ctr events to use events service

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

event listeners

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: helper func for emitting in services

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: improved cli for containers and tasks

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

create event envelope with poster

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: introspect event data to use for type url

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: use pb encoding; add event types

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: instrument content and snapshot services with events

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: instrument image service with events

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: instrument namespace service with events

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: add namespace support

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: only send events from namespace requested from client

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

events: switch to go-events for broadcasting

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-06-20 10:47:28 -04:00
Akihiro Suda
e4bc59a295 package for manipulating OCI images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-14 06:49:56 +00:00
Derek McGowan
1cdb010783
Replace lockfile with reference lock
Updates content service to handle lock errors and return
them to the client. The client remote handler has been
updated to retry when a resource is locked until the
resource is unlocked or the expected resource exists.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-08 16:07:38 -07:00
Derek McGowan
a4b2e580f2
Update continuity
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-05-31 13:35:03 -07:00
Akihiro Suda
f9039092c5 vendor: OCI Image Spec v1.0.0-rc6
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-05-27 12:27:14 +00:00
Stephen J Day
b626757d06
vendor: update grpc dependencies
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-25 17:20:23 -07:00
Justin Cormack
a413d3ed0d Update go-runc and console
This removes need for cgo in both of these, and updates licenses.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-24 17:38:24 +01:00
Evan Hazlett
617a2270f6
bump fifo dependency to 69b995
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-05-23 14:14:54 -04:00
Qiang Huang
8f3b89c79d Merge pull request #890 from darrenstahlmsft/revendorGowinio
Update go-winio to v0.4.1
2017-05-23 10:21:59 +08:00
Darren Stahl
ae6f82241d Update go-winio to v0.4.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-22 17:08:03 -07:00
Michael Crosby
7cc1b64bd8 Add checkpoint and restore
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Update go-runc to 49b2a02ec1ed3e4ae52d30b54a291b75

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add shim to restore creation

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Keep checkpoint path in service

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add C/R to non-shim build

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Checkpoint rw and image

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Pause container on bind checkpoints

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Return dump.log in error on checkpoint failure

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Pause container for checkpoint

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Update runc to 639454475cb9c8b861cc599f8bcd5c8c790ae402

For checkpoint into to work you need runc version
639454475cb9c8b861cc599f8bcd5c8c790ae402 + and criu 3.0 as this is what
I have been testing with.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Move restore behind create calls

This remove the restore RPCs in favor of providing the checkpoint
information to the `Create` calls of a container.  If provided, the
container will be created/restored from the checkpoint instead of an
existing container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Regen protos after rebase

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-22 15:34:45 -07:00
Phil Estes
26f4d4448e
Reference actual versions for specs in vendor.conf
For runtime and image spec from OCI, reference the actual versions
instead of a git hash for clarity on versions in use.

Actual impact was zero; runtime spec was the exact hash of the released
rc5 already, image spec was one commit behind the tagged release, but
made no code changes other than version string.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-05-18 16:46:28 -04:00
Justin Cormack
6a571ecd40 Portability fixes for containerd shim
Update go-runc to master with portability fixes.

Subreaper only exists on Linux, and only Linux runs the shim in a
mount namespace.

With these changes the shim compiles on Darwin, which means the
whole build compiles without errors now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-05-16 17:13:32 +01:00