Phil Estes
0c07626faf
Merge pull request #2073 from crosbymichael/revert-json
...
revert json iter changes
2018-01-29 16:30:30 -05:00
Michael Crosby
2f06259a84
Revert "Add github.com/json-iterator/go to vendor"
...
This reverts commit 43a9473a53
.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-29 15:47:58 -05:00
Michael Crosby
d179c61231
Revert "Use jsoniteer for faster json encoding/decoding"
...
This reverts commit 4233b87b89
.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-29 15:47:48 -05:00
Lantao Liu
23e872a44d
Update containerd to ec15fe95aa
.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-29 18:44:16 +00:00
Phil Estes
c6a7d10568
Merge pull request #2065 from dmcgowan/content-discard-over-truncate
...
content: update copy to discard instead of truncate
2018-01-29 11:20:17 -05:00
Lantao Liu
8d2d125d82
Merge pull request #577 from Random-Liu/fix-privileged-check
...
Fix a privileged check.
2018-01-27 20:24:09 -08:00
Lantao Liu
4dfd8250fd
Fix a privileged check.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-27 02:25:52 +00:00
Derek McGowan
b763777288
diff: rename differ to comparer
...
Remove combined interface and split implementations.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-26 16:32:09 -08:00
Phil Estes
ec15fe95aa
Merge pull request #2068 from crosbymichael/json
...
Use jsoniter for faster json encoding/decoding
2018-01-26 17:47:48 -05:00
Lantao Liu
9f6315bc88
Merge pull request #576 from Random-Liu/add-benchmark-image-config
...
Add image config for benchmark.
2018-01-26 14:33:10 -08:00
Michael Crosby
c024da2dec
Fix vendor exclude
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:58:05 -05:00
Michael Crosby
4233b87b89
Use jsoniteer for faster json encoding/decoding
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:32:55 -05:00
Michael Crosby
43a9473a53
Add github.com/json-iterator/go to vendor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:32:55 -05:00
Stephen Day
c71595f6e2
Merge pull request #2067 from crosbymichael/all-caps
...
Add WithAllCapabilities as SpecOpt
2018-01-26 13:21:33 -08:00
Lantao Liu
5ed3262450
Add image config for benchmark.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-26 20:04:49 +00:00
Derek McGowan
a12f493bd3
Update copy to discard over truncate
...
Prevents the copy method from calling discard on the
writer when the reader is not seekable. Instead,
the copy method will discard up to the offset.
Truncate is a more expensive operation since any
bytes that are truncated already have their hash calculated
and are stored on disk in the backend. Re-writing bytes
which were truncated requires transfering the data over
GRPC again and re-computing the hash up to the point of
truncation.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-26 11:44:50 -08:00
Derek McGowan
02d737f967
Add resume content test cases
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-26 11:44:50 -08:00
Michael Crosby
4e27c4d53d
Add WithAllCapabilities as spec opt
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 14:31:32 -05:00
Michael Crosby
8f75d658d7
Add syndtr/gocapability to vendor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 14:31:19 -05:00
Michael Crosby
fc63a6cc3a
Merge pull request #2066 from estesp/error-no-image
...
Add error return for missing params in ctr images
2018-01-26 11:47:05 -05:00
Phil Estes
d4fb0709c9
Add error return for missing params in ctr images
...
For missing required parameters adds error return before attempting any
actions to `ctr images` commands.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-01-26 09:14:13 -05:00
Lantao Liu
08644a7fff
Merge pull request #575 from miaoyq/use-channel-propagate-stop-info-of-sandbox
...
Use channel to propagate the stop info of sandbox
2018-01-26 01:58:32 -08:00
Yanqiang Miao
61c1fdb098
Use channel to propagate the stop info of sandbox
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-26 16:58:13 +08:00
Jess Valarezo
2c9ce2e693
ctr: add container create, config flag for spec
...
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2018-01-25 17:16:13 -08:00
Lantao Liu
f401662123
Merge pull request #571 from Random-Liu/do-not-list-task
...
Avoid containerd access as much as possible.
2018-01-25 16:13:43 -08:00
Lantao Liu
df58d6825d
Avoid containerd access as much as possible.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 23:36:00 +00:00
Lantao Liu
eb6e23ab49
Merge pull request #572 from Random-Liu/add-runtime-cgroup
...
Add runtime cgroup and fix a cli panic.
2018-01-25 15:14:47 -08:00
Lantao Liu
e7f2a74a84
Add runtime cgroup and fix a cli panic.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 22:32:57 +00:00
Akihiro Suda
b580441f91
diff: resplit Applier from Differ
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-25 13:58:34 -08:00
Lantao Liu
11042a4141
Merge pull request #570 from miaoyq/fixes-569
...
Use channel to pass the stop info instead of polling for container stop
2018-01-25 10:27:18 -08:00
Michael Crosby
b268261446
Merge pull request #2059 from stevvooe/update-go-runc
...
vendor: update go-runc to reduce gc pressure
2018-01-25 10:11:19 -05:00
Yanqiang Miao
c663d2423e
Use channel to pass the stop info instead of polling for container stop
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-25 11:07:54 +08:00
Akihiro Suda
2448ae6976
Merge pull request #2054 from dmcgowan/fix-duplicate-tar-file
...
Fix duplicate directories entries on metadata change
2018-01-25 12:03:36 +09:00
Derek McGowan
7e4403540d
Merge pull request #1969 from darrenstahlmsft/WindowsSnapshotter5
...
Implement Windows snapshotter and differ
2018-01-24 17:02:02 -08:00
Stephen J Day
f534a20173
vendor: update go-runc to reduce gc pressure
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-24 16:19:24 -08:00
Stephen Day
3fcc52b091
Merge pull request #2055 from stevvooe/aggressive-memory-shim
...
cmd/containerd-shim: aggressive memory reclamation
2018-01-24 16:06:57 -08:00
Kenfe-Mickaël Laventure
9dd56e002c
Merge pull request #2056 from stevvooe/reduce-channel-size
...
cmd/containerd-shim, reaper: reduce channel allocation
2018-01-24 16:00:24 -08:00
Stephen J Day
71e9f6dac2
cmd/containerd-shim, reaper: reduce channel allocation
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-24 15:14:08 -08:00
Stephen J Day
0e8f08476c
cmd/containerd-shim: aggressive memory reclamation
...
To avoid having the shim hold on to too much memory, we've made a few
adjustments to favor more aggressive reclamation of memory from the
operating system. Typically, this would be negligible, on the order of a
few megabytes, but this is impactful when running several containers.
The first fix is to lower the threshold used to determine when to run
the garbage collector. The second runs `runtime/debug.FreeOSMemory` at a
regular interval.
Under test, this result in a sustained memory usage of around 3.7 MB.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-24 14:51:13 -08:00
Derek McGowan
dfadd8ce75
Fix duplicate directories entries on metadata change
...
Currently directory changes are not added to the list of
included directories, allowing those directories to receive
duplicate entries where there is both a metadata change to the
directory and a change to a file under that directory.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-01-24 14:28:51 -08:00
Derek McGowan
8d32d9edfc
Merge pull request #2052 from darrenstahlmsft/PullDenied
...
content.Fetch: better error when auth fails
2018-01-24 13:20:03 -08:00
Lantao Liu
4fcf8d91b8
Merge pull request #567 from Random-Liu/update-containerd
...
Update containerd and leverage plugin graceful stop.
2018-01-23 16:24:25 -08:00
Darren Stahl
f404331e90
ctr: print error when pull auth fails
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 16:14:09 -08:00
Darren Stahl
95a0b3af95
Refactor checking for compressed diff type
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 15:25:17 -08:00
Darren Stahl
e6280a7c82
Enable integration tests on Windows using snapshotter and differ
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 15:25:17 -08:00
Lantao Liu
635e5747c0
Update containerd and leverage plugin graceful stop.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Darren Stahl
acf2087db9
Error on no rootfs provided
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 14:40:24 -08:00
Darren Stahl
e981cc6289
Do not create new layer for View
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 14:40:24 -08:00
Darren Stahl
dcff993653
Update Windows runtime to use snapshotter and differ layers
...
This changes the Windows runtime to use the snapshotter and differ
created layers, and updates the ctr commands to use the snapshotter and differ.
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 14:40:24 -08:00
Darren Stahl
a5a9f91832
Implement Windows snapshotter and differ
...
This implements the Windows snapshotter and diff Apply function.
This allows for Windows layers to be created, and layers to be pulled
from the hub.
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-23 14:40:23 -08:00