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

2903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
9d155e8164 Merge pull request #1015 from crosbymichael/benchmark 
Benchmark container create and task start
 2017-06-15 16:07:32 -07:00
Michael Crosby
268ab7c053 Benchmark container create and task start 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-15 10:43:59 -07:00
Phil Estes
f2963f7562 Merge pull request #1012 from miaoyq/add-format-description-for-ctr-info 
Add 'ArgsUsage' for ctr sub-cmds
 2017-06-15 11:12:53 -04:00
Kenfe-Mickaël Laventure
40fbd282cc Merge pull request #1014 from ijc/log-when-skipping-a-plugin 
Do not claim to be loading a plugin which we aren't.
 2017-06-15 07:31:46 -07:00
Daniel, Dao Quang Minh
05cfd0e8d3 Merge pull request #1011 from AkihiroSuda/godoc 
README.md: add GoDoc badge
 2017-06-15 14:32:59 +01:00
Phil Estes
5e65d62ed9 Merge pull request #968 from dmcgowan/pull-schema-1 
Add schema1 conversion on pull
 2017-06-15 09:15:17 -04:00
Ian Campbell
66b7f8d79f Do not claim to be loading a plugin which we aren't. 
I had forgotten to update my config.toml after #994 and was very confused by:

INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading plugin "io.containerd.content.v1.content"...  module=containerd type=io.containerd.content.v1
INFO[0000] loading plugin "io.containerd.snapshotter.v1.btrfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.snapshotter.v1.overlayfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.differ.v1.base-diff"...  module=containerd type=io.containerd.differ.v1
containerd: no plugins registered for io.containerd.snapshotter.v1

Where apparently two candidates for io.containerd.snapshotter.v1 had been
loaded but the error claimed (correctly, it turns out) that none were. With
this change instead I see:

INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading plugin "io.containerd.content.v1.content"...  module=containerd type=io.containerd.content.v1
INFO[0000] skipping plugin "io.containerd.snapshotter.v1.btrfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] skipping plugin "io.containerd.snapshotter.v1.overlayfs"...  module=containerd type=io.containerd.snapshotter.v1
INFO[0000] loading plugin "io.containerd.differ.v1.base-diff"...  module=containerd type=io.containerd.differ.v1
containerd: no plugins registered for io.containerd.snapshotter.v1

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-15 14:04:56 +01:00
Akihiro Suda
490530be04 README.md: add GoDoc badge 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-15 08:08:17 +00:00
Yanqiang Miao
b88b53212f Add 'ArgsUsage' for some ctr sub-cmds 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-06-15 16:04:11 +08:00
Derek McGowan
c215531a8f Merge pull request #994 from crosbymichael/bundles 
Setup plugin ids and dependencies
 2017-06-14 17:03:46 -07:00
Derek McGowan
64bc516bbe
Add with block and fail on non-temp dial error 
This guarantees that grpc requests will fail quickly
when the service is not started or does not have permission.
Without the fail on non-temp error the withblock will
cause the client to wait until the timeout before failing.

Fixes #989

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 16:50:37 -07:00
Michael Crosby
94e7f8e943 Setup plugin ids and dependencies 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-14 16:17:20 -07:00
Derek McGowan
38c3cc71de
Content store writer checks expected 
Fixes #1004

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 14:54:13 -07:00
Derek McGowan
6bbed2c125 Merge pull request #1003 from crosbymichael/gprc-metrics 
Register grpc metrics in main
 2017-06-14 13:04:59 -07:00
Phil Estes
e10a9aff7d
Use error interfaces for content/metadata 
These interfaces allow us to preserve both the checking of error "cause"
as well as messages returned from the gRPC API so that the client gets
full error reason instead of a default "metadata: not found" in the case
of a missing image.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-06-14 15:55:08 -04:00
Michael Crosby
f5c587c1f7 Merge pull request #1002 from mlaventure/runtime-error-bubble 
Bubble up linux runtime errors
 2017-06-14 12:25:25 -07:00
Kenfe-Mickael Laventure
c9064df2cf
Discard grpc logs by default 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 11:58:13 -07:00
Derek McGowan
8ed1e24ae9
Add blob state calculation to handle empty ambiguity 
The size and throwaway fields in the history can bother be
omitted, making the emptiness of a layer ambiguous. In these
cases download and check whether the content is empty.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 11:53:52 -07:00
Michael Crosby
c2dd40c9bc Register grpc metrics in main 
This needs to be registered last after all other services have been
registred.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-14 11:19:58 -07:00
Michael Crosby
9b8e76edf1 Merge pull request #929 from AkihiroSuda/ociimage 
package for manipulating OCI images
 2017-06-14 10:50:16 -07:00
Kenfe-Mickael Laventure
709ba260de
linux: Ensure shim is killed if we can't connect to it initially 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
5922cfaba8
linux: Bubble up runc error message 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
33598cc5d3
linux: Wrap error with contextual message 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
171759a233
linux: Return grpc error description only 
This avoid having "rpc error: code = Unknown" in the final output.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-14 10:21:48 -07:00
Derek McGowan
3a226ef17d
Update logic to determine if layer is empty 
Handle reliance on the size field when the throwaway field is not used.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 10:07:40 -07:00
Derek McGowan
9f90d8a9b4
Add schema1 conversion on pull 
closes #851

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-14 10:07:39 -07:00
Michael Crosby
7dbf26ecf6 Merge pull request #1001 from ijc/nuke-getTempDir 
ctr: Remove getTempDir
 2017-06-14 09:06:29 -07:00
Ian Campbell
e9559c6eed ctr: Remove getTempDir 
It is unused since 4c1af8fdd8 ("Port ctr to use client") and leaving it
around will just tempt people into writing code with security holes.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-14 15:30:11 +01: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
Phil Estes
4576979244 Merge pull request #997 from stevvooe/no-image-container 
containerd: allow containers without an image
 2017-06-13 16:26:04 -04:00
Stephen J Day
27af417668
containerd: allow containers without an image 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-13 11:23:53 -07:00
Stephen Day
4d44b9358e Merge pull request #988 from dmcgowan/client-default-namespace 
Add default namespace to client
 2017-06-12 16:24:28 -07:00
Michael Crosby
2e048ec589 Merge pull request #965 from dmcgowan/content-read-at 
Update push to use copy
 2017-06-12 16:19:53 -07:00
Derek McGowan
e67c6be052
Add default namespace to client 
Adds a default namespace to the client.
Intercepts client requests to add namespace to context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-12 15:47:58 -07:00
Michael Crosby
9226143b16 Merge pull request #978 from crosbymichael/process-delete 
Add DeleteProcess API for removing execs
 2017-06-12 10:00:12 -07:00
Kenfe-Mickaël Laventure
64e83bab10 Merge pull request #991 from crosbymichael/test-name 
Use t.Name() for container ids in tests
 2017-06-12 09:40:58 -07:00
Michael Crosby
ff598449d1 Add DeleteProcess API for removing execs 
We need a separate API for handing the exit status and deletion of
Exec'd processes to make sure they are properly cleaned up within the
shim and daemon.

Fixes #973

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-12 09:32:23 -07:00
Michael Crosby
be5da790a3 Use t.Name() for container ids in tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-12 09:27:17 -07:00
Qiang Huang
4e8548cd3f Merge pull request #987 from crosbymichael/report-jun9 
Add dev report for june 9th
 2017-06-10 21:48:25 +08:00
Michael Crosby
7fb4c6d185 Add dev report for june 9th 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 16:33:36 -07:00
Michael Crosby
cf602e3aac Merge pull request #979 from dmcgowan/content-upload-lock-fix 
Replace lockfile with reference lock
 2017-06-09 15:02:57 -07:00
Stephen Day
7759386675 Merge pull request #986 from estesp/non-block-grpc-dist 
Don't use WithBlock() on `dist` gRPC connection
 2017-06-09 13:59:32 -07:00
Phil Estes
9f028b50cb
Don't use WithBlock() on dist gRPC connection 
When using WithBlock() on the dialer, the connection timeout must fully
expire before any status is provided to the user about whether they can
even connect to the socket. For example, if the containerd socket is
root-owned and the user tries `dist images ls` without `sudo`, the
default is 30 sec. of "hang" before the command returns.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-06-09 15:40:14 -04:00
Michael Crosby
beaff3d81d Merge pull request #985 from samuelkarp/task-delete-nil-check 
containerd: nil-check before calling io.Close
 2017-06-09 11:31:04 -07:00
Michael Crosby
c45dae71db Merge pull request #983 from tonistiigi/fix-ctx-imports 
Fix context package imports
 2017-06-09 11:23:49 -07:00
Samuel Karp
779efbce6a containerd: nil-check before calling io.Close 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-06-09 11:21:40 -07:00
Derek McGowan
6c91ee2dac Merge pull request #980 from crosbymichael/service-tasks 
Namespace tasks within runtime
 2017-06-09 11:02:33 -07:00
Tonis Tiigi
39d55cc498 Fix context package imports 
Conflicting with definition of plugin.Differ

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-09 10:58:29 -07:00
Michael Crosby
588c11852b Move task list to runtimes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:37:33 -07:00
Michael Crosby
a40f307e88 Namespace cgroups monitor ids 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-09 10:35:17 -07:00