Commit Graph

5581 Commits

Author SHA1 Message Date
Derek McGowan
a40c3830df
Add option to pull all metadata
Add flags to pull and fetch to grab all metadata.
Add fetch option to pull only metadata.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-26 11:05:21 -07:00
Michael Crosby
dfd76b3484
Merge pull request #3579 from thaJeztah/bump_hashicorp_deps
Bump hashicorp deps
2019-08-26 11:44:46 -04:00
Phil Estes
3ad49a208b
Merge pull request #3578 from sofat1989/containerd-stress
update the max if cur will be greater than max for setting the limit
2019-08-26 05:57:40 -07:00
Sebastiaan van Stijn
55f737bd32
bump hashicorp/golang-lru v0.5.3
full diff: https://github.com/hashicorp/golang-lru/compare/v0.5.1...v0.5.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:40:08 +02:00
Sebastiaan van Stijn
ed1df65c25
bump hashicorp/go-multierror v1.0.0
full diff: ed905158d8...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:37:53 +02:00
Sebastiaan van Stijn
cbb3a3790e
bump hashicorp/errwrap v1.0.0
full diff: 7554cd9344...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:36:33 +02:00
fesu
5cab0d3f3f update the max if cur will be greater than max for setting the limit
Signed-off-by: Su Fei <sofat1989@126.com>
2019-08-26 15:09:01 +08:00
Maksym Pavlenko
24b9e2c1a0 Merge configs section by section
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-23 15:49:02 -07:00
Maksym Pavlenko
8ebffecbc3 Use map for stream processors
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-23 15:31:37 -07:00
Yu Yi
aae2d0d754
delete unnecessary checks and fix a test
Signed-off-by: Yu Yi <yiyu@google.com>
2019-08-23 14:02:56 -07:00
Yu Yi
9e183f5e52
add cli option to download all manifests
- Add `all-manifests` option to both `ctr content fetch` and `ctr
  images pull`. By default it is false.
- This option ties to `AppendDistributionSourceLabel` in client.

Signed-off-by: Yu Yi <yiyu@google.com>
2019-08-23 14:02:56 -07:00
Michael Crosby
4a2f61c4f2
Merge pull request #2918 from Random-Liu/parellel-unpack
Add simultaneous unpack support
2019-08-23 15:06:03 -04:00
Maksym Pavlenko
ea6c749e35 Update config doc
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-23 11:08:25 -07:00
Maksym Pavlenko
19cd0a4f12 Append slices when importing config files
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-23 10:12:19 -07:00
Derek McGowan
a1f4ffb211
Merge pull request #3575 from crosbymichael/seccom2.3
Pin to libseccomp 2.3.3
2019-08-23 10:06:37 -07:00
Michael Crosby
b5f03eacd3 Pin to libseccomp 2.3.3
lib seccomp 2.4 has huge performance regressions.
This change pins to 2.3.3 where that is not an issue

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-23 15:19:38 +00:00
renzhen.rz
4d11bb36ad devmapper: activate dm device if snap device marked as activated
- reproducer
 1. stop a container;
 2. reboot, or dmsetup remove its corresponding dm device;
 3. start the container, it will fail like:

 """
 Error: failed to start containers: {"message":"failed to create container(4f33d2760760c41518a84821153ccdf7f80980b797b783cdd75178fc6ca0bf4b) on containerd: failed to create task for container(4f33d2760760c41518a84821153ccdf7f80980b797b783cdd75178fc6ca0bf4b): failed to mount rootfs component &{ext4 /dev/mapper/vg0-mythinpool-snap-2 []}: no such file or directory: unknown"}
 """
- how the fix works
 activate the dm device if necessary, and give a warn msg:

 """
 time="2019-08-21T22:44:08.422695797+08:00" level=warning msg="devmapper device \"vg0-mythinpool-snap-2\" marked as \"Activated\" but not active, activating it"
 """

Signed-off-by: Eric Ren <renzhen@linux.alibaba.com>
2019-08-23 10:19:28 +08:00
Maksym Pavlenko
bca0857530 Fix toml plugin decoding
Do not rely on toml metadata when decoding plugin's configs as it's not possible to merge toml.MetaData structs during import.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-22 17:22:25 -07:00
Maksym Pavlenko
a1e3779cad Support config imports #3289
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-22 15:50:58 -07:00
Maksym Pavlenko
6e2228df72 Vendor github.com/imdario/mergo
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-08-22 15:41:50 -07:00
Derek McGowan
80ed8e1a64
Merge pull request #3573 from crosbymichael/ttrpc-env
Pass ttrpc address to shim via env
2019-08-22 14:08:59 -07:00
Michael Crosby
6cf031e1e4 Pass ttrpc address to shim via env
Because of the way go handles flags, passing a flag that is not defined
will cause an error. In our case, if we kept this as a flag, then
third-party shims would break when they see this new flag.  To fix this,
I moved this new configuration option to an env var.  We should use env
vars from here on out to avoid breaking shim compat.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-22 20:37:49 +00:00
Michael Crosby
1be6ee5396
Merge pull request #3555 from kevpar/ttrpc-address
Allow explicit configuration of TTRPC address
2019-08-22 14:37:56 -04:00
Wei Fu
8333d98c2b
Merge pull request #3571 from ethan-daocloud/typo-terminator
Cleanup: fix some typos in code comment
2019-08-22 23:33:50 +08:00
Michael Crosby
e963290458
Merge pull request #3562 from dmcgowan/update-release-1.3
Update 1.3 release notes and mailmap
2019-08-22 10:57:28 -04:00
Guangming Wang
89eae6429f Cleanup: fix some typos in code comment
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-08-22 22:42:50 +08:00
Kevin Parsons
d7e1b25384 Allow explicit configuration of TTRPC address
Previously the TTRPC address was generated as "<GRPC address>.ttrpc".
This change now allows explicit configuration of the TTRPC address, with
the default still being the old format if no value is specified.

As part of this change, a new configuration section is added for TTRPC
listener options.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-08-22 00:56:27 -07:00
Lantao Liu
03aafaa1cf Update the integration test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-21 16:31:29 -07:00
Lantao Liu
60f73b6cf1 Support simultaneous image unpack.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-21 16:31:29 -07:00
Phil Estes
bd46ea5191
Merge pull request #3570 from dmcgowan/fix-apply-trailing-data
Read trailing data on apply
2019-08-21 13:07:49 -07:00
Derek McGowan
550518ab84
Read trailing data on apply
This was removed by mistake during the direct unpack
PR refactoring.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-21 11:41:56 -07:00
Derek McGowan
348e9f7c35
Update release notes and mailmap
The beta period has ended, start preparing rc
release notes.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-21 10:46:04 -07:00
Akihiro Suda
4924bcb5fe
Merge pull request #3530 from jterry75/revenor_hcsshim
Revendor github.com/Microsoft/hcsshim
2019-08-21 16:55:42 +09:00
Phil Estes
8580926066
Merge pull request #3563 from Random-Liu/update-release-note
Update release note for CRI plugin for 1.3.
2019-08-20 19:48:27 -04:00
Lantao Liu
8acf5a142a Update release note for CRI plugin for 1.3.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-20 15:06:33 -07:00
Justin Terry (VM)
041e9debb1 Revendor github.com/Microsoft/hcsshim
1. Revendors github.com/Microsoft/hcsshim to the latest known good commit.
This includes numerous bug fixes and improvements.

2. Vendors indirect dependency on go.opencensus.io since hcsshim now uses trace
correlation.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-08-20 13:50:24 -07:00
Phil Estes
640860a042
Merge pull request #3559 from fuweid/avoid-read-config
runtime: only check killall for init process
2019-08-20 13:08:55 -04:00
Wei Fu
cd76c4120e
Merge pull request #3560 from keloyang/buffersize-32
Change bufferSize back to 32
2019-08-20 23:20:30 +08:00
Shukui Yang
21174cb497 Change bufferSize back to 32
Shim use non-blocking send now, there is no need to set bufferSize to 2048,
it's a waste.

Signed-off-by: Shukui Yang <keloyangsk@gmail.com>
2019-08-20 22:10:11 +08:00
Michael Crosby
08061c7c3c
Merge pull request #3540 from crosbymichael/shim-hang
Use non-blocking send and retry for exit events
2019-08-20 09:31:21 -04:00
Wei Fu
1073868e5e runtime: only check killall for init process
When containerd-shim does reaper, the most processes are not init
process. Since json.Decode consumes more CPU resource, we should check
killall option for init process only.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-08-20 19:18:34 +08:00
Derek McGowan
c6da899e2f
Merge pull request #3551 from crosbymichael/default-env
Remove the process default ENV
2019-08-19 14:04:39 -07:00
Phil Estes
c537c8968c
Merge pull request #3550 from kevpar/remove-eventlog
Remove Windows EventLog logging hook
2019-08-19 15:04:42 -04:00
Kevin Parsons
64a0b2eb26 Revendor to remove unused dependencies
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-08-19 11:23:34 -07:00
Michael Crosby
7379fa6631 Remove the process default ENV
With the change in #3542 it breaks $PATH handling for images becuase our
default spec always sets a PATH on the process's .Env.

This removes the default and adds an Opt to add this back.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-19 18:18:58 +00:00
Kevin Parsons
5023d96ad2 Remove Windows EventLog logging hook
EventLog is very old and provides a poor experience. We have supported
ETW for logging for a while, which is much better. We have also
observed an issue where EventLog keeps containerd.exe open, preventing
containerd from being upgraded to a new version. Due to all of this,
it makes sense to remove the old EventLog hook in favor of using ETW
logging on Windows as the primary diagnostic experience.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-08-19 10:24:37 -07:00
Phil Estes
fc9335d75c
Merge pull request #3459 from crosbymichael/timeout-config
Allow timeouts to be configured in config
2019-08-19 13:16:43 -04:00
Michael Crosby
6cb56bb605
Merge pull request #3536 from darfux/ignore_closed_fifo_error_under_multi_cntr
Ignore fifo error when using v2 multi-container shim
2019-08-19 11:06:56 -04:00
Michael Crosby
0ab7f03fee
Merge pull request #3528 from dmcgowan/overlay-direct-unpack
Add direct unpack support for overlay
2019-08-19 10:26:48 -04:00
Michael Crosby
2763639388 Try to preserve exit event order
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-19 14:23:12 +00:00