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
Zhang Wei
a06abd7493
[progress] Fix wrong display of progress bar
...
When we try to pull an image with "ctr pull xxx", the progress bar
display will flush all the screen and make it so hard to find useful
information for user.
This commit fixes bugs for the progress bar, by correcting "line counting"
algorithm. Previous algorithm only counts number of "\n", but one line
can be longer than screen width, in which case it should be counted as
two lines. Also updated the screen cleaning ESC chars.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-10-17 00:24:54 +08:00
Kenfe-Mickaël Laventure
103dd0e75e
Merge pull request #1644 from cpuguy83/unmarshal_error_desc
...
Improve error message for `WithContainerExtension`
2017-10-16 09:17:46 -07:00
Michael Crosby
c1a0775136
Build release tar and include hash
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-16 12:07:11 -04:00
Michael Crosby
7f4f4b5e68
Merge pull request #1646 from mlaventure/mlaventure-email
...
Update @mlaventure e-mail address
2017-10-16 11:21:01 -04:00
Phil Estes
3c7645a89d
Merge pull request #1647 from yanxuean/typo
...
a typo in comment of Snapshotter.Update
2017-10-16 10:19:31 -04:00
yanxuean
d8d1209e50
a typo in comment of Snapshotter.Update
...
containerd/snapshot/snapshotter.go
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-16 19:36:27 +08:00
Kenfe-Mickael Laventure
bdf801bd36
Update @mlaventure e-mail address
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-13 14:50:33 -07:00
Brian Goff
0847ae6cdf
Improve error message for WithContainerExtension
...
The previous error messages are not very descriptive in how to fix the
issue, especially since they come from container create and not when
calling `WithContainerExtensions`.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-10-13 13:41:52 -04:00
Lantao Liu
70023a3c37
Merge pull request #350 from ijc/subtract
...
typo: subtract not substract.
2017-10-13 10:40:38 -07:00
Ian Campbell
d75e0882c4
typo: subtract not substract.
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-13 09:50:17 +01:00
Lantao Liu
09c2bfadd2
Reduce image pull race.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-13 05:17:43 +00:00
Lantao Liu
4b8f87214d
Merge pull request #348 from Random-Liu/remove-oomscore-in-systemd
...
Remove the oom score in systemd unit. cri-containerd sets it by itself.
2017-10-12 20:45:00 -07:00
Lantao Liu
49c3876b8b
Merge pull request #349 from Random-Liu/fix-node-e2e
...
Fix node e2e test.
2017-10-12 18:30:56 -07:00
Derek McGowan
c66fd83eae
Merge pull request #1636 from crosbymichael/cgroups
...
Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48
2017-10-12 15:52:46 -07:00
Michael Crosby
d805f77f50
Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-12 14:24:16 -04:00
Lantao Liu
313db21033
Fix node e2e test.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-12 18:03:09 +00:00
Lantao Liu
a7d12a1dd8
Remove the oom score in systemd unit. cri-containerd sets it by itself.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-12 17:32:20 +00:00
Lantao Liu
e71db95d0e
Merge pull request #347 from yanxuean/oomscore
...
Add a flag to set OOMScore
2017-10-12 10:27:01 -07:00
Phil Estes
91614a57dc
Merge pull request #1633 from ijc/go1.9
...
Update docs with go 1.9 requirement.
2017-10-12 10:17:39 -04:00
Phil Estes
71c4ee5cf8
Merge pull request #1629 from dmcgowan/remove-archive-umask
...
archive: remove umask, replace with explicit chmod after create
2017-10-12 10:16:36 -04:00
Ian Campbell
680bab8468
Update docs with go 1.9 requirement.
...
re: #1632
The comment about plugins in README.md didn't seem relevant any longer so I
removed it.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-10-12 15:06:36 +01:00
yanxuean
3887b0a1a0
Add a flag to set OOMScore
...
fix #337
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-12 16:43:35 +08:00
Lantao Liu
885024f987
Merge pull request #295 from miaoyq/use-mount-lookup
...
Get the mountInfo by 'LookupMount' in containerd
2017-10-11 21:05:39 -07:00
Lantao Liu
61d598d00f
Merge pull request #235 from yanxuean/truncindex
...
Add Truncindex for container, sandbox and image
2017-10-11 21:03:16 -07:00
Yanqiang Miao
c65921b16a
Get the mountInfo by 'LookupMount' in containerd
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-10-12 11:09:24 +08:00
yanxuean
5ee3423820
add truncindex
...
fix #222
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-12 10:32:20 +08:00
Stephen Day
a543c937eb
Merge pull request #1630 from stevvooe/beta2
...
release: prepare 1.0.0-beta.2
2017-10-11 18:09:50 -07:00
Stephen J Day
683ed979f4
release: prepare 1.0.0-beta.2
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-10-11 18:09:32 -07:00
Derek McGowan
dcf7ff5db5
Update apply diff to support context cancellation
...
Allows cancellation of apply when the grpc service issues a cancel.
Adds a timing log for apply.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 16:48:55 -07:00
Stephen Day
1fe31c7e2e
Merge pull request #1628 from crosbymichael/release-tool
...
add release tool to generate releases
2017-10-11 16:15:53 -07:00
Michael Crosby
769d9e16bd
add release tool to generate releases
...
This tool makes our standard release template easy to generate. It also
adds a few features like marking changed dependnencies for packages and
others to know what updated from the last release.
usage:
`containerd-release -n releases/v1.0.0-beta.2.toml`
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-11 18:51:13 -04:00
Derek McGowan
e20b371807
Remove umask, replace with explicit chmod after create
...
Call chmod on all open files and created directories to
ensure permission is set as expected without changing umask.
Fixes #1608
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 15:13:18 -07:00
Stephen Day
587f25245a
Merge pull request #1563 from dmcgowan/gc-alpha
...
Metadata garbage collection
2017-10-11 14:31:44 -07:00
Michael Crosby
3cc75915db
Merge pull request #1627 from jessvalarezo/task-remove-cast
...
Remove ProcessInfo cast
2017-10-11 16:11:22 -04:00
Jess Valarezo
1e69de18bd
Remove ProcessInfo cast
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-11 13:01:15 -07:00
Phil Estes
b5152f2746
Merge pull request #1626 from jessvalarezo/windows-changes
...
Change hcsshimopts to hcsshimtypes package
2017-10-11 15:00:52 -04:00
Jess Valarezo
830e0ea339
Change hcsshimopts to hcsshimtypes package
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2017-10-11 11:42:07 -07:00
Derek McGowan
ffb03c4fe2
Add checkpoint and userns gc labels
...
Prevent checkpoints from getting garbage collected by
adding root labels to unreferenced checkpoint objects.
Mark checkpoints as gc roots.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 11:26:46 -07:00
Derek McGowan
de7b281856
Update services to call garbage collection
...
Call garbage collection on container and image deletion.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 10:42:47 -07:00
Derek McGowan
17471d5592
Metadata garbage collection
...
Marks and sweeps unreferenced objects.
Add snapshot cleanup to metadata.
Add content garbage collection
Add dirty flags for snapshotters and content store which
are set on deletion and used during the next garbage collection.
Cleanup content store backend when content metadata is removed.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 10:42:47 -07:00
Derek McGowan
7884707c2f
Add reference labels to snapshots and content
...
Ensure all snapshots and content are referenced on commit and
protected from cleanup.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 10:42:47 -07:00
Lantao Liu
a34bc19f62
Merge pull request #339 from Random-Liu/add-node-e2e-prow
...
Add prow node e2e test.
2017-10-11 10:36:55 -07:00
Stephen Day
551579b316
Merge pull request #1621 from dmcgowan/refactor-diff
...
Refactor differ into separate package
2017-10-11 10:21:19 -07:00
Derek McGowan
64a96aab8a
Abort newly created references on error
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-10-11 10:10:19 -07:00