Commit Graph

4032 Commits

Author SHA1 Message Date
Tao Qingyun
61121024c1 ctr use client's underlying service
Signed-off-by: Tao Qingyun <845767657@qq.com>
2017-10-23 20:22:54 +08:00
Phil Estes
5b6564d89d Merge pull request #1667 from crosbymichael/more-lint
Fix more lint issues across services
2017-10-23 11:30:39 +02:00
Akihiro Suda
230dc74a72 Merge pull request #1669 from crosbymichael/container-api-tests
Add additional container test for missing methods
2017-10-23 11:02:35 +02:00
Phil Estes
43ec3df34b
Add testing information to BUILDING.md
Add more detail on how to test containerd with `Makefile` targets,
`containerd-stress`, and external projects like `bucketbench`.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-10-21 15:36:06 -04:00
Michael Crosby
b937d230ba Add additional container test for missing methods
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 16:25:11 -04:00
Michael Crosby
5fd0415985 Add comments and fix common lint issues
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 13:19:14 -04:00
Michael Crosby
9bd1dc78cb Unexport grpc service types
Since these are registered and the interface is what matters, these
Service types do not need to be exported.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 13:19:14 -04:00
Kenfe-Mickaël Laventure
3679a55883 Merge pull request #1665 from crosbymichael/bump-runc
Bump runc to 74a17296470088de3805e138d3d87c62e613d
2017-10-20 08:45:56 -07:00
Michael Crosby
8feebb7513 Bump runc to 74a17296470088de3805e138d3d87c62e613d
This bumps the runc version to 74a17296470088de3805e138d3d87c62e613dfc4
that includes various fixes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 10:58:04 -04:00
Phil Estes
91a33a0b47 Merge pull request #1664 from qingyunha/issue1607
move the fifo locations /run/containerd
2017-10-20 16:40:51 +02:00
Tao Qingyun
f325d51c5e move the fifo locations /run/containerd
Signed-off-by: Tao Qingyun <845767657@qq.com>
2017-10-20 06:56:21 +08:00
Michael Crosby
c7dc795455 [ctr] add --detach to run
This allows the user to detach from the container after it has started.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-19 15:13:38 -04:00
Michael Crosby
2e004086cf [ctr] Add --null-io to ctr run/start
This allows all task io to be redirected to /dev/null

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-19 15:01:33 -04:00
Michael Crosby
992280e8e2 Merge pull request #1662 from mlaventure/update-cgroups
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
2017-10-19 11:05:05 -04:00
Kenfe-Mickael Laventure
7c9be56930
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
This fixes a leak of the oom_control eventfd to child processes.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-19 07:55:16 -07:00
Michael Crosby
1752bf590a Merge pull request #1660 from stevvooe/update-security-email
README, RELEASES: update security email
2017-10-19 09:57:07 -04:00
Stephen J Day
639d1bdd62
README, RELEASES: update security email
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-10-19 13:34:55 +02:00
Derek McGowan
f2ae8a020a Merge pull request #1658 from dmcgowan/gc-content-delete
Update content store garbage collection
2017-10-18 15:47:39 -07:00
Derek McGowan
923a5c873b
Update content store garbage collection
Use single instance of content store instead of
creating new one for each collection. Using new
instance and wrapping causes failures.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-18 15:30:12 -07:00
Michael Crosby
87596ad708 Merge pull request #1657 from mlaventure/vendor-go-runc
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
2017-10-18 16:36:38 -04:00
Kenfe-Mickael Laventure
90c535521a
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
This fixes possible panics in Run & Restore when done without IOs

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-18 13:24:12 -07:00
Michael Crosby
84fa3967c5 Merge pull request #1656 from crosbymichael/rev-name
Reverse checkpoint url
2017-10-18 15:07:57 -04:00
Michael Crosby
21c992a9c8 Reverse checkpoint url
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-18 14:58:28 -04:00
Kenfe-Mickaël Laventure
5244d7b829 Merge pull request #1655 from dmcgowan/skip-user-ns-tests
tests: skip user namespace tests in kernels which have it disabled
2017-10-18 11:34:43 -07:00
Michael Crosby
cbeb0a847c Merge pull request #1652 from crosbymichael/cr-image
create image for checkpoint
2017-10-18 14:31:13 -04:00
Derek McGowan
efcec3674a
Skip user namespace tests in kernels which have it disabled
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-18 11:20:17 -07:00
Kenfe-Mickaël Laventure
ce57d6d619 Merge pull request #1634 from crosbymichael/release-build
refactor release tool
2017-10-18 07:35:42 -07:00
Michael Crosby
5a386446e3 Merge pull request #1653 from dmcgowan/fix-pull-race
gc: fix pull race
2017-10-18 10:10:32 -04:00
Phil Estes
ca63e6d10f Merge pull request #1645 from cpuguy83/limited_reader
Use limited reader for some `ReadAll` cases.
2017-10-18 11:56:14 +02:00
Derek McGowan
b798d87bd4
Ensure manifests are marked as root during pull
For schema1 mark blobs as roots and remove labels
once referenced by the created manifest.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-17 16:26:52 -07:00
Michael Crosby
e4c6bf3b5e Remove default filter from ctr
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-17 17:10:03 -04:00
Michael Crosby
e833da1356 Clear root labels during checkpoint
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-17 16:53:44 -04:00
Michael Crosby
e201be5196 Create checkpointed image in client
Allow a user provided name for the checkpoint as well as a default
generated name for the checkpoint image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-17 15:12:04 -04:00
Michael Crosby
a19fd6ed6e Add checkpoint media types to handler
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-17 11:26:28 -04:00
Jacob Wen
abbec62620 cmd/ctr: create an image for checkpoint
This allows one to manage the checkpoints by using the `ctr image`
command.

The image is created with label "containerd.io/checkpoint". By
default, it is not included in the output of `ctr images ls`.
We can list the images by using the following command:
$ ctr images ls labels.containerd.\"io/checkpoint\"==true

Fixes #1026

Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
2017-10-17 11:25:37 -04:00
Brian Goff
6eb56a2ec9 Use limited reader for some ReadAll cases.
Prevents a server from sending a large response causing containerd to
allocate too much RAM and potentially OOM.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-10-17 09:06:16 -04:00
Stephen Day
70b5668351 Merge pull request #1631 from dmcgowan/cancel-unpack
archive: update apply diff to support context cancellation
2017-10-17 05:33:25 -07:00
Stephen Day
3c89aafdc3 Merge pull request #1649 from mlaventure/win-procdetaisl-use-stdtime
windows: Use stdtime for hcsshimtypes.ProcessDetails.CreatedAt
2017-10-17 05:23:12 -07:00
Michael Crosby
6b9edd089a Merge pull request #1640 from Random-Liu/fix-image-pull-race
Reduce image pull race.
2017-10-16 17:54:23 -04:00
Michael Crosby
2cdb3951a4 Merge pull request #1643 from cpuguy83/close_wait_chan
Close wait chan after sending status
2017-10-16 17:07:33 -04:00
Brian Goff
205625473f Close wait chan after sending status
This allows the caller to receive multiple times without blocking after
the first call.

This can be useful in cases like this:
```go
  ch, _  := task.Wait(ctx)
  defer func() { <-ch } // don't return until task is done
  task.Start(ctx)

  if err := doSomething(task); err != nil {
    return err
  }

  status := <- ch
  // do stuff with status
```

Since this channel is created in the `Wait()` calls and never accessible
outside, this should be safe.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-10-16 16:55:43 -04:00
Kenfe-Mickael Laventure
e7ea7b5b50
windows: Use stdtime for hcsshimtypes.ProcessDetails.CreatedAt
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-16 13:40:17 -07:00
Phil Estes
ef5fe56c24 Merge pull request #1641 from WeiZhang555/fix-progress-bar
[progress] Fix wrong display of progress bar
2017-10-16 16:32:10 -04:00
Kenfe-Mickaël Laventure
79dad0ab02 Merge pull request #1650 from dmcgowan/fix-gc-race
gc: fix race and test failures
2017-10-16 12:57:14 -07:00
Derek McGowan
295cce278f
Use single instance of snapshot and content stores
Ensures that all callers and the garbage collector are using
the same lock instances to prevent cleanup of objects
during creation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-16 11:57:50 -07:00
Derek McGowan
e378196505
Add snapshot label command to ctr
Allows easier debugging of snapshots using labels

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-16 11:54:01 -07:00
Michael Crosby
d28b8cc80d Merge pull request #1648 from mlaventure/checkpoint-workdir
linux: Pass correct path to runc when doing a checkpoint
2017-10-16 13:58:47 -04:00
Kenfe-Mickaël Laventure
7562047f6a Merge pull request #1642 from mlaventure/arm-panic
linux: Ensure count is 64bits aligned for proper atomic use on 32bits machines
2017-10-16 10:56:02 -07:00
Kenfe-Mickael Laventure
71f0bb3e3c
linux: Pass correct path to runc when doing a checkpoint
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-16 10:45:03 -07:00
Kenfe-Mickael Laventure
d8e489443c
linux: Ensure count is 64bits aligned for proper atomic use on 32bits machines
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-16 10:15:01 -07:00