Commit Graph

5275 Commits

Author SHA1 Message Date
Phil Estes
a0696b2bc6
Merge pull request #3374 from crosbymichael/runtime
Refactor runtime package for code usage
2019-07-08 12:51:47 -04:00
Michael Crosby
dce11a21de
Merge pull request #3395 from hinshun/metadata-actual
Fix metadata content store to call writer digest after commit
2019-07-08 12:49:33 -04:00
Michael Crosby
6601b406b7 Refactor runtime code for code sharing
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-08 11:47:53 -04:00
Phil Estes
2aa8780ce6
Merge pull request #3393 from lifupan/fix_deadshim
shimv2: remove the dead task from runtime task list
2019-07-08 11:42:55 -04:00
Edgar Lee
7d21172453 Fix metadata content store to call writer digest after commit
Signed-off-by: Edgar Lee <edgarl@netflix.com>
2019-07-08 07:26:49 -07:00
Phil Estes
d80513ee8a
Merge pull request #3388 from seemethere/image_tag
Add ctr images tag subcommand
2019-07-08 10:02:01 -04:00
Eli Uriegas
af93e4009b ctr: Add images tag subcommand
Adds a subcommand for tagging images managed by containerd.

Usage:

  ctr images tag docker.io/library/alpine:latest docker.io/library/alpine:new

Comes with a --force flag to allow you to gracefully overwrite image references
that already exist.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-07-06 15:44:17 +00:00
lifupan
ec8d9d3d7a shimv2: remove the dead task from runtime task list
When shimv2 dead, the container would be cleanup, but
the corresponding runtime task still existed in runtime
task lists, it should be deleted too.

Signed-off-by: lifupan <lifupan@gmail.com>
2019-07-04 15:51:03 +08:00
Justin
c1c710ae16
Merge pull request #3390 from Ace-Tang/update-go-runc
vendor: bump go-runc
2019-07-03 11:05:05 -07:00
Ace-Tang
d3e1a51f85 vendor: bump go-runc
bump go-runc to 9007c2405372fe28918845901a3276c0915689a1
in order to support get actually error log if checkpint fail, this
version get two new diff

Add common project content/checks:
8e51df4212
Fix Method of judging command execution
failure:4e99c72acd

Signed-off-by: Ace-Tang <aceapril@126.com>
2019-07-03 21:57:10 +08:00
Michael Crosby
876c8890ae
Merge pull request #3384 from mxpv/exec-log-uri
Support --log-uri in exec subcommand
2019-07-02 14:34:13 -04:00
Maksym Pavlenko
46af8ccd2d Check exec log flags compatibility
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-02 09:53:11 -07:00
Michael Crosby
3ce077e740
Merge pull request #3385 from ehotinger/ehotinger/refactor-winio
Bump go-winio and refactor Windows snapshotters
2019-07-02 10:54:05 -04:00
Eric Hotinger
9fda4a5fe6 Bumps the version of go-winio.
This also refactors the lcow and windows
snapshotters to use go-winio's utility functions for checking the
filesystem type.

Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-07-01 14:51:06 -07:00
Maksym Pavlenko
6b59b425e2 Support --log-uri for exec subcommand
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-01 13:32:37 -07:00
Phil Estes
6617defdc9
Merge pull request #3383 from crosbymichael/ns-delete
Add cgroup delete opt for ns deletion
2019-07-01 16:22:09 -04:00
Michael Crosby
844c58102e Add cgroup delete opt for ns deletion
Closes #3305

This adds an opt and a `--cgroup,-c` flag to `ctr namespaces rm` to
remove the cgroup that is commonly created with runtimes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-01 15:01:02 -04:00
Michael Crosby
d1b766a52b
Merge pull request #3382 from knm3000/content_fetch_retry
Handle RequestTimeout and TooManyRequests
2019-07-01 13:04:45 -04:00
Konstantin Maksimov
3d3dbc8fbf Handle RequestTimeout and TooManyRequests
Retry 5 times in case of StatusRequestTimeout StatusTooManyRequests
This fixes the issue #2680 "Make content fetch retry more robust"

Signed-off-by: Konstantin Maksimov <kmaksimov@gmail.com>
2019-07-01 19:19:40 +03:00
Derek McGowan
041d8d7051
Merge pull request #3366 from crosbymichael/exec-pid
Robust pid locking for shim processes
2019-06-29 15:36:51 +08:00
Phil Estes
c2c2b068fd
Merge pull request #3380 from crosbymichael/oom-scores
Set shim OOM scores to +1 containerd daemon score
2019-06-28 08:34:43 +08:00
Michael Crosby
7dfc605fc6 Set shim OOM scores to +1 containerd daemon score
This changes the shim's OOM score from a static max killable of -999 to
be +1 of the containerd daemon's score.  This should allow the shim's to
be killed first in an OOM condition but leave the daemon alone for a bit
to help cleanup and manage the containers during this situation.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-27 11:14:14 -04:00
Michael Crosby
719a2c594e Robust pid locking for shim processes
Closes #2832

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-26 11:43:57 -04:00
Michael Crosby
bb9616ba20
Merge pull request #3379 from Ace-Tang/clean-doc
docs: remove shim_no_newns in ops.md
2019-06-26 11:30:21 -04:00
Michael Crosby
e89e57c52d
Merge pull request #3377 from estesp/remove-old-doc
No need to keep 2017 DockerCon doc
2019-06-26 09:56:42 -04:00
Ace-Tang
2d03791158 docs: remove shim_no_newns in ops.md
this ops is removed in commit fd2e3cd326,
remove from doc avoid misleading users.

Signed-off-by: Ace-Tang <aceapril@126.com>
2019-06-26 16:37:36 +08:00
Phil Estes
0886e4f1b7
No need to keep 2017 DockerCon doc
Remove outdated discussion document from repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-06-26 00:00:59 -04:00
Phil Estes
0e87608c2a
Merge pull request #3371 from thaJeztah/bump_libseccomp
bump libseccomp-golang v0.9.1
2019-06-26 08:17:36 +08:00
Michael Crosby
89ec47972f
Merge pull request #3373 from Mattias-/release-hashsum
Add hashsum for release archives
2019-06-25 17:24:10 -04:00
Mattias Appelgren
650a7e5c1e Add hashsum for release archives
Signed-off-by: Mattias Appelgren <mattias@ppelgren.se>
2019-06-25 21:00:09 +02:00
Michael Crosby
5b4ed0d886
Merge pull request #3372 from thaJeztah/bump_runc
bump runc v1.0.0-rc8-32-gf4982d86
2019-06-25 10:28:05 -04:00
Sebastiaan van Stijn
cb4a8f51a6
bump runc v1.0.0-rc8-32-gf4982d86
full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc8...f4982d86f7fde0b6f953cc62ccc4022c519a10a9

possibly relevant changes included:

- opencontainers/runc#2074 Update dependency libseccomp-golang
  - fixes https://nvd.nist.gov/vuln/detail/CVE-2017-18367
- opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
- opencontainers/runc#2042 libcontainer: intelrdt: add missing destroy handler in defer func
- opencontainers/runc#2042 main: not reopen /dev/stderr
- opencontainers/runc#2038 `r.destroy` can defer exec in `runner.run` method
- opencontainers/runc#2035 specconv: always set "type: bind" in case of MS_BIND
- opencontainers/runc#2035 Move systemd.Manager initialization into a function in that module
- opencontainers/runc#2034 Support for logging from children processes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-25 13:03:23 +02:00
Sebastiaan van Stijn
bb41ef87f1
bump libseccomp-golang v0.9.1
full diff: 32f571b700...689e3c1541

Release notes:

* Version 0.9.1 - May 21, 2019
- Minimum supported version of libseccomp bumped to v2.2.0 (fc0298087f)
- PowerPC and S390(x) architectures are unavailable below library version v2.3.0 and will return errors if used with incompatible libraries
- Use Libseccomp's `seccomp_version` API to retrieve library version
- Unconditionally set TSync attribute for filters, due to Go's heavily threaded nature
- Fix [CVE-2017-18367](https://nvd.nist.gov/vuln/detail/CVE-2017-18367) - Multiple syscall arguments were incorrectly combined with logical-OR, instead of logical-AND (06e7a29f36)
- Fix a failure to build on Debian-based distributions due to CGo code
- Fix unit test failures on 32-bit architectures
- Improve several errors to be more verbose about their causes
- Add support for SCMP_ACT_LOG (with libseccomp versions 2.4.x and higher), permitting syscalls but logging their execution
- Add support for SCMP_FLTATR_CTL_LOG (with libseccomp versions 2.4.x and higher), logging not-allowed actions when they are denied

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-25 10:57:58 +02:00
Phil Estes
287582585f
Merge pull request #3365 from crosbymichael/exec-lk
Reserve exec id to prevent race
2019-06-25 08:59:41 +08:00
Phil Estes
b2662f21a2
Merge pull request #3370 from mxpv/file-io
Fix shim's file IO logging
2019-06-25 08:57:56 +08:00
Maksym Pavlenko
174c4907d0 Fix shim's file IO logging
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-06-24 13:21:41 -07:00
Michael Crosby
1a8df3f237 Reserve exec id to prevent race
ref #2820

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-21 14:52:44 -04:00
Michael Crosby
b88362fd55
Merge pull request #3361 from crosbymichael/io-wait
Add timeout for I/O waitgroups
2019-06-21 14:28:46 -04:00
Michael Crosby
245052243d Add timeout for I/O waitgroups
Closes #3286

This and a combination of a couple Docker changes are needed to fully
resolve the issue on the Docker side.  However, this ensures that after
processes exit, we still leave some time for the I/O to fully flush
before closing.  Without this timeout, the delete methods would block
forever.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-06-20 16:13:51 -04:00
Phil Estes
574bde08ba
Merge pull request #3360 from ZYecho/polish-log
fix: polish log to make more clear
2019-06-20 18:17:44 +03:00
Phil Estes
6f788f861e
Merge pull request #3358 from ehotinger/ehotinger/gh-templates
Switch to GitHub's new issue templates.
2019-06-20 18:16:42 +03:00
Phil Estes
b95f0a6cea
Merge pull request #3359 from keloyang/close-socket-fd
Close the inherited socket fd
2019-06-20 18:12:25 +03:00
zhangyue
12a14c4424 fix: polish log to make more clear
Signed-off-by: zhangyue <zy675793960@yeah.net>
2019-06-20 20:46:26 +08:00
Shukui Yang
ec78305c49 Close the inherited socket fd
containerd-shim has dup the fd 3, and it don't need fd 3 any more.

Signed-off-by: Shukui Yang <keloyangsk@gmail.com>
2019-06-20 19:35:05 +08:00
Wei Fu
111b082e20
Merge pull request #3356 from mxpv/binary-io-path
BinaryIO/LogFile creator bug fixing
2019-06-20 10:25:47 +08:00
Maksym Pavlenko
fbf96d302a Fix path in LogFile creator
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-06-19 16:53:33 -07:00
Michael Crosby
7ac57b6392
Merge pull request #3357 from odinuge/dependency-cgroups
Update dependency containerd/cgroups
2019-06-19 16:43:35 -04:00
Eric Hotinger
63a8dee60d Switch to GitHub's new issue templates.
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-06-19 12:28:24 -07:00
Odin Ugedal
341c7c144f
Update dependency containerd/cgroups
Signed-off-by: Odin Ugedal <odin@ugedal.com>
2019-06-19 21:19:00 +02:00
Michael Crosby
8bb521318a
Merge pull request #3055 from ehotinger/ehotinger/flow-opts
Allow opts to flow to the backend snapshotter during snapshot creation.
2019-06-19 14:54:36 -04:00