Stephen J Day
c517a005b5
content/testsuite: ensure unique content per test
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-29 15:29:38 -08:00
Michael Crosby
5f89502a24
Merge pull request #1790 from jessvalarezo/ctr-c-create
...
ctr: add container create cmd and config flag
2018-01-29 17:19:14 -05:00
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
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
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
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
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
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
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
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
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
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
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
Michael Crosby
12eaf13f6f
Merge pull request #2045 from Random-Liu/add-closer
...
Add `Closer` in plugin.
2018-01-23 17:02:06 -05:00
Lantao Liu
d8f87a5a65
Add Closer
in plugin.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 20:14:04 +00:00
Phil Estes
d7efcbc083
Merge pull request #2036 from stevvooe/use-buffer-pools
...
archive, cio, cmd, linux: use buffer pools
2018-01-23 15:00:41 -05:00
Michael Crosby
ef485c80ec
Merge pull request #2049 from dnephin/fix-errorf-return
...
Replace t.Error(); return with t.Fatal()
2018-01-23 14:43:02 -05:00
Michael Crosby
410db39d44
Merge pull request #2048 from crosbymichael/bump-runc
...
Update runc to 9f9c96235cc97674e935002fc3d78361b69
2018-01-23 14:37:52 -05:00
Daniel Nephin
1cd32fa68d
Cleanup extra returns in tests
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-23 14:09:22 -05:00
Kenfe-Mickaël Laventure
cee56a1226
Merge pull request #2047 from estesp/use-libcontainer-subreaper-api
...
Remove unnecessary subreaper API from sys/
2018-01-23 08:48:56 -08:00
Phil Estes
f47f6af585
Remove unnecessary subreaper API from sys/
...
Given these same exact functions are both now available in
opencontainers/runc (libcontainer/system) package, and we only use the
`SetSubreaper` today from the shim, there seems to be no reason for
duplication.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-01-23 10:30:29 -05:00
Michael Crosby
8dfbd59e60
Update runc to 9f9c96235cc97674e935002fc3d78361b69
...
This fixes issues for init and exec hanging forever when an error
happends on start.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-23 10:05:26 -05:00
Phil Estes
dc5964ccc2
Merge pull request #2037 from pauldotknopf/master
...
Made a public method to set environment variables and mounts for containers.
2018-01-22 17:05:26 -05:00
Stephen J Day
cd72819b53
archive, cio, cmd, linux: use buffer pools
...
To avoid buffer bloat in long running processes, we try to use buffer
pools where possible. This is meant to address shim memory usage issues,
but may not be the root cause.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-22 13:52:06 -08:00
Stephen Day
933979bd10
Merge pull request #2041 from estesp/trim-add-go-issue-link
...
Add Golang issue link re: -trimpath to Makefile
2018-01-22 13:46:53 -08:00
Paul Knopf
b4c3cd7640
Add WithEnv and WithMount oci options
...
Signed-off-by: Paul Knopf <pauldotknopf@gmail.com>
2018-01-22 16:35:31 -05:00