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

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
72bb45ac46 Merge pull request #1603 from mlaventure/fix-windows-flaky-tests 
windows: ensure a init process exist after "Create()"
 2017-10-09 11:58:23 -04:00
Kenfe-Mickael Laventure
cfa87567a0
windows: Create init process with task 
This prevents `task.Wait()` to return an error if it is called before the task
is started.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-09 08:40:12 -07:00
Kenfe-Mickael Laventure
ad5266456c
windows: Fix a few races 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-09 08:40:12 -07:00
Kenfe-Mickaël Laventure
b2e348231c Merge pull request #1584 from miaoyq/fix-mount-lookup-err 
Fixes looking up mountinfo corresponds to path
 2017-10-09 08:35:01 -07:00
Lantao Liu
6cb3d27ed3 Use device number to find uuid 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-09 06:10:43 +00:00
Lantao Liu
9135ef2c07 Merge pull request #334 from Random-Liu/change-versioning 
Change `Version` to return cri-containerd version instead.
 2017-10-08 20:28:39 -07:00
Yanqiang Miao
d7c4611848 Ensure getting the correct mountinfo corresponds to path 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-10-08 17:16:28 +08:00
Akihiro Suda
a8426ed9e7 Merge pull request #1609 from crosbymichael/attach-docs 
Add docs around multiple attach
 2017-10-08 11:24:57 +09:00
Lantao Liu
2449ffdc42 Add staging tar for node e2e. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-07 04:45:10 +00:00
Lantao Liu
09d7d652e6 Change Version to return cri-containerd version instead. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-07 00:47:51 +00:00
Derek McGowan
6c3f393765 Merge pull request #1611 from stevvooe/address-cgroup-merge-conflicty 
metrics/cgroups: handle error on call to cgroup
 2017-10-06 16:09:20 -07:00
Stephen J Day
77e5f6553c
metrics/cgroups: handle error on call to cgroup 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-10-06 15:51:20 -07:00
Michael Crosby
bbb01ee1ab Add docs around multiple attach 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-06 17:31:11 -04:00
Phil Estes
987fcd1201 Merge pull request #1598 from Random-Liu/fix-load-task 
Fix task load.
 2017-10-06 16:38:40 -04:00
Stephen Day
67bbfc5d1c Merge pull request #1605 from dmcgowan/metadata-db-documentation 
Add documentation for metadata database
 2017-10-06 13:37:00 -07:00
Derek McGowan
e4defbcb6d
Add documentation for metadata database 
Add documentation and explanation for migrations.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-06 13:33:07 -07:00
Lantao Liu
e77795b968 Merge pull request #332 from Random-Liu/use-container-update 
Use container update
 2017-10-06 13:20:30 -07:00
Michael Crosby
6f351f0a85 Merge pull request #1586 from mathieui/postmortem-stats 
Collect cgroup stats one last time before exit
 2017-10-06 15:44:28 -04:00
Lantao Liu
e78c85f76b Use new container update function 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-06 17:57:26 +00:00
Lantao Liu
46ed19b23c Merge pull request #331 from Random-Liu/run-repodigest-node-e2e 
Run repodigest test.
 2017-10-06 10:18:37 -07:00
Michael Crosby
d92f6eea1f Allow blocking and non-blocking metrics collection 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-06 12:05:56 -04:00
Mathieu Pasquet
ed519bb5ce Collect cgroup stats one last time before exit 
This commit adds a collection step in the Stop() task handler which will
retrieve the metrics available for this container at that time, and
store them until the next prometheus Collect() cycle.

This allows short-lived containers to be visible in prometheus, which
would otherwise be ignored (for example, running containerd-stress would
show something like 2 or 3 containers in the end, while now we can see
all of them). It also allows for more accurate collection when
long-running containers end (for example CPU usage could spike in the
last few seconds).

A simple case illustrating this with cpu usage would be:

  ctr run -t --rm docker.io/library/alpine:latest mycontainer sh -c 'yes > /dev/null & sleep 3 && pkill yes'

Signed-off-by: Mathieu Pasquet <mathieu.pasquet@alterway.fr>
 2017-10-06 15:40:38 +02:00
Lantao Liu
f7eaa29c67 Update containerd to 8558b98eb1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-06 01:40:39 +00:00
Lantao Liu
3ff61f9010 Run repodigest test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 23:55:55 +00:00
Stephen Day
8558b98eb1 Merge pull request #1582 from dmcgowan/metadata-db-object 
Create metadata db object
 2017-10-05 16:50:44 -07:00
Derek McGowan
7f657ce3de
Add database migrations 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-05 16:35:58 -07:00
Lantao Liu
28ca8f05d3 Fix task load. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 21:03:24 +00:00
Lantao Liu
d2122d62dd Merge pull request #324 from Random-Liu/installation 
Add guide for installation from release tarball
 2017-10-05 13:43:59 -07:00
Lantao Liu
1e00322107 Add guide for installation from release tarball 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 18:44:23 +00:00
Lantao Liu
eb2ea51e00 Merge pull request #329 from Random-Liu/update-kubernetes-hack-versions 
Update `hack/versions`
 2017-10-05 09:47:47 -07:00
Phil Estes
7c4bca591f Merge pull request #1600 from AkihiroSuda/defaultspec 
spec: set MaskedPaths and ReadOnlyPaths by default
 2017-10-05 12:16:09 -04:00
Lantao Liu
e64d267ae8 Update Kubenretes to the right version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 06:07:48 +00:00
Akihiro Suda
d7b0e522c7 spec: set MaskedPaths and ReadOnlyPaths by default 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-10-05 06:01:35 +00:00
Lantao Liu
3a5ec1cf6e Merge pull request #328 from Random-Liu/fix-container-stats-panic 
Fix container stats panic.
 2017-10-04 21:45:19 -07:00
Lantao Liu
94b68ae662 Fix container stats panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-05 02:18:19 +00:00
Phil Estes
72a3a019ae Merge pull request #1595 from crosbymichael/container-lock 
sync container metadata before operations
 2017-10-04 21:48:30 -04:00
Stephen Day
28882fddae Merge pull request #1589 from mlaventure/shim-no-newns 
Add an option to prevent putting the shim in a new mount namespace
 2017-10-04 17:24:26 -07:00
Lantao Liu
d25c632bfe Merge pull request #327 from Random-Liu/fix-image-volume 
Skip not exist image volume directory.
 2017-10-04 16:22:06 -07:00
Lantao Liu
0bcc95e4a1 Skip not exist image volume directory. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-04 22:43:24 +00:00
Michael Crosby
fa9e9bdf46 Fetch current container info before operations 
This makes sure the client is always in sync with the server before
performing any type of operations on the container metadata.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-10-04 15:29:57 -04:00
Derek McGowan
8d892a651b
Update metadata plugin initialization 
Updates metadata plugin to require content and
snapshotter plugins be loaded and initializes with
those plugins, keeping the metadata database structure
static after initialization. Service plugins now only
require metadata plugin access snapshotter or content
stores through metadata, which was already required
behavior of the services.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-04 11:25:46 -07:00
Derek McGowan
2ab70f21ac
Add content and snapshot store references 
Update database object to hold reference to the
data stores.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-04 11:16:22 -07:00
Derek McGowan
447a0a9452
Add children bucket to back reference snapshots 
Adds back links from parent to children in order to prevent
deletion of a referenced snapshot in a namespace.
Avoid removing snapshot during metadata delete to
prevent shared namespaces from being mistakenly deleted.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-04 11:16:22 -07:00
Derek McGowan
56c1b79a4c
Create metadata db object 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-04 11:16:22 -07:00
Lantao Liu
23b8330b44 Merge pull request #322 from miaoyq/fix-314 
Update kubernetes version to the PR#52395 and support `unconfined` apparmor
 2017-10-04 10:49:56 -07:00
Kenfe-Mickaël Laventure
acba0f50ef Merge pull request #1594 from akimd/akim/clean 
style: move definition for consistency
 2017-10-04 09:18:43 -07:00
Kenfe-Mickaël Laventure
ec43dc2b46 Merge pull request #1592 from AkihiroSuda/workdir2 
ctr run: add --cwd
 2017-10-04 09:17:21 -07:00
Kenfe-Mickael Laventure
26d4c2c217
Add an option to prevent putting the shim in a new mount namespace 
This is needed for users on kernel older than 3.18 so they can avoid EBUSY
errors when trying to unlink, rename or remove a mountpoint that is present in
a shim namespace.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-04 09:16:02 -07:00
Michael Crosby
0ae9d8fabf Merge pull request #1567 from stevvooe/image-check-function 
images: support checking status of image content
 2017-10-04 11:40:43 -04:00
Akim Demaille
8ceeeed4ae style: move definition for consistency 
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
 2017-10-04 17:02:51 +02:00