Commit Graph

5531 Commits

Author SHA1 Message Date
Michael Crosby
3f5e6cdeaa
Merge pull request #2717 from dmcgowan/diff-set-uncompressed-label
Set uncompressed label on diff when already exists
2018-10-15 15:16:21 -04:00
Derek McGowan
26506e9e23
Update empty layer label
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-15 11:28:45 -07:00
Derek McGowan
bb197ddc47
Set uncompressed label on diff when already exists
Diff expects to set the uncompressed label on Commit, however
if the blob already exists in the content store, no labels
will get set, requiring an Update. Check if the uncompressed
label is on the blob and set it if not.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-15 11:02:35 -07:00
Michael Crosby
50c020f4d5
Merge pull request #2716 from estesp/reference-common-project-repo
Reference common project repo contents
2018-10-15 11:46:36 -04:00
Phil Estes
bd93a66fc2
Use common project repo copies of travis scripts
Remove local copies of common containerd/project located scripts for
DCO, fileheader, and vendor checks.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-15 09:05:48 -04:00
Phil Estes
6f3288333c
Move common repository details to project references
Now that all the content is set up appropriately in the
containerd/project repo, remove local copies and point to the common
project content from the containerd README.md

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-15 09:05:37 -04:00
Akihiro Suda
0146a48cb8
Merge pull request #2712 from nogoegst/mount-openbsd
mount: add support for OpenBSD
2018-10-13 11:23:21 +09:00
Akihiro Suda
61f4ecb1e1
Merge pull request #2713 from nogoegst/archive-openbsd
archive: add support for OpenBSD
2018-10-13 11:22:34 +09:00
Ivan Markin
a20603090f archive: add support for OpenBSD
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-10-12 22:29:24 +00:00
Ivan Markin
0828b7aa96 mount: add support for OpenBSD
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-10-12 22:24:13 +00:00
Phil Estes
1a5f9a3434
Merge pull request #2710 from fuweid/enhance_support_duration_for_cpu_profile_collection
enhance: support specific duration for profile collection
2018-10-11 11:00:25 -04:00
Phil Estes
09aa58bee5
Merge pull request #2705 from jterry75/detachvhd
Dismount sandbox VHD on snapshot remove
2018-10-11 10:35:26 -04:00
Derek McGowan
f67459929e
Merge pull request #2700 from jiria/jiria/add-windows-arm-support
Add support to detect ARM variant on Windows
2018-10-10 16:47:54 -07:00
Jiri Appl
e6529f4ebc Add support to detect ARM variant on Windows
ARM variant detection logic was authored originally with
POSIX OS in mind. This change leaves POSIX code path unaltered
and adds support to detect ARM variant on Windows by leveraging
runtime.goarch.

Signed-off-by: Jiri Appl <jiria@microsoft.com>
2018-10-10 14:17:11 -07:00
Justin Terry (VM)
00242e1668 Dismount sandbox VHD on snapshot remove
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 13:35:06 -07:00
Phil Estes
31aa418f84
Merge pull request #2704 from jterry75/remove_tar2vhd
Remove dependency on tar2vhd for LCOW differ
2018-10-10 15:38:55 -04:00
Justin Terry (VM)
cce78d4b5d Remove dependency on tar2vhd for LCOW differ
This change no longer requires the use of a UtlityVM on Windows to convert the
layer tar to an ext4 vhd for LCOW. This has a significant performance boost
that makes linux/amd64 layer extraction comparable to native Linux performance.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 11:40:10 -07:00
Wei Fu
a2a23d91ca enhance: support specific duration for profile collection
The default duration of cpu profile collection in net/http/pprof is 30
seconds. User should have chance to set the specific duration for the
collection.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-10 22:57:54 +08:00
Phil Estes
15f19d7a67
Merge pull request #2702 from Random-Liu/update-cri-release-1.2
Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
2018-10-08 09:42:59 -04:00
Lantao Liu
88bfc17d14 Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-05 14:53:17 -07:00
Derek McGowan
0c5f8f63c3
Merge pull request #2699 from dmcgowan/update-1.2-rc.1
Update version to 1.2-rc.1
2018-10-03 14:43:26 -07:00
Derek McGowan
7b750c7b83
Update version to 1.2-rc.1
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-03 14:00:06 -07:00
Derek McGowan
0e6a562b1d
Merge pull request #2698 from jterry75/lcow_spec_opt
Skip AdditionalGID's for LCOW oci spec
2018-10-03 13:58:09 -07:00
Justin Terry (VM)
223acbca2a Skip AdditionalGID's for LCOW oci spec
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-03 10:43:29 -07:00
Phil Estes
de4bb2ddfb
Merge pull request #2692 from jterry75/shim_reconnect
Various runhcs shim fixes
2018-10-03 10:51:04 +02:00
Phil Estes
43acab8100
Merge pull request #2690 from dmcgowan/resolver-updates
Update Docker resolver to pass in Authorizer interface
2018-10-03 09:58:42 +02:00
Phil Estes
90b7b88e10
Merge pull request #2696 from dmcgowan/import-docker-tar-test
Content store fix and import integration test
2018-10-03 09:57:25 +02:00
Derek McGowan
29dab3bb24
Merge pull request #2694 from AkihiroSuda/continuity-testutil
remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
2018-10-02 14:30:51 -07:00
Derek McGowan
440c7ed249
Fix commit already exists not leasing
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-02 14:16:57 -07:00
Justin Terry (VM)
ab2031236a Add blocking buffered writes to shim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-02 11:10:43 -07:00
Justin Terry (VM)
beb1f432be Review fixes
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-02 11:10:43 -07:00
Justin Terry (VM)
2ddbb2db05 Handle shim delete workdir on Windows
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-02 11:10:43 -07:00
Justin Terry (VM)
b8945d35f5 Decrease shim timeout on pipe not found
On Windows because of the way the log pipe is forwarded to the shim there is a
condition where the pipe listener may not yet be active when a client tries to
connect. To handle this case we allow polling on the file and rety on pipe not
found. This limits the pipe not found retry to 5 seconds but leaves the connect
timeout alone as if there is a listener we want to connect to it normally.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-02 11:10:43 -07:00
Justin Terry (VM)
ddbeb3f7c7 Adds Windows shim reconnect logs support
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-02 11:10:37 -07:00
Akihiro Suda
5349fa31df remove pkg/testutil/loopback_linux.go and use continuity/testutil/loopback
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-02 13:12:25 +09:00
Derek McGowan
b6107dca86
Add import integration test
Move tar creation test utilities to separate package
Test all supported formats for import

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-01 11:47:10 -07:00
Derek McGowan
a6198b7692
Update resolver code
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-28 14:32:23 -07:00
Phil Estes
ac01f20a8e
Merge pull request #2577 from samuelkarp/stop-signal
ctr: make kill optionally use stop-signal
2018-09-28 12:05:56 -04:00
Michael Crosby
655ba65875
Merge pull request #2686 from jterry75/runhcs_improvements
Various containerd-shim-runhcs bug fixes/improvements
2018-09-28 11:19:54 -04:00
Wei Fu
57d79e1b49 bugfix: cache empty layer for docker schema1 image
containerd should cache empty label for docker schema1 image.

if not, the original empty layer will be non-empty layer and the image
config will be changed too. in this case, the image ID will be changed.

check the blob empty label to avoid changing image ID when repull docker
schema1 image.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-09-28 15:45:59 +08:00
Samuel Karp
607888ce29 ctr: make kill use stop-signal by default
The OCI image specification includes a `StopSignal` field in the image
configuration, denoting the system call signal to be sent to the
container to exit.  This commit adds a new `WithImageStopSignal` container
option that can be used for storing the `StopSignal` field as a label on
the container.  This commit also adjusts `ctr run` to call
`WithImageStopSignal` and `ctr tasks kill` to send the signal stored in
that label by default.

Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-09-27 15:53:38 -07:00
Samuel Karp
b392a3a8e4 signals: move ParseSignal to containerd package
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-09-27 15:53:38 -07:00
Phil Estes
df60d3272a
Merge pull request #2687 from dmcgowan/fix-pigz-panic
Fix panic when bufio Reader called in 2 goroutines
2018-09-27 12:43:09 -04:00
Justin Terry (VM)
81eb40fabf Adds containerd-shim-runhcs verbose logging support
Revendors to Microsoft/hcsshim v0.7.5 that added support for logging all
runhcs.exe commands via Windows named pipes. This now launches all runhcs.exe
commands and forwards debug logging to the containerd-shim-runhcs log when
with --debug.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
772644e978 Fixes containerd-shim-runhcs State on exec id
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
83437ef646 Fixes containerd-shim-runhcs Delete on exec id
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
84aa0bfde6 Forward containerd debug to shim invocation
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:01 -07:00
Lifubang
cb0eed833d decode Spec value in command 'ctr c info <containerid>'
Signed-off-by: Lifubang <lifubang@aliyun.com>

fix some errors

use typeurl.UnmarshalAny instead json.Unmarshal to interface{}

Signed-off-by: Lifubang <lifubang@aliyun.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-27 10:44:54 -04:00
Michael Crosby
75d7d6e7a8
Merge pull request #2684 from dmcgowan/manifest-resolution
Update manifest resolution for non-index manifests
2018-09-27 10:24:47 -04:00
Derek McGowan
db358a9fd2
Fix panic when bufio Reader called in 2 goroutines
A panic was seen related to the buffer being reset in
one goroutine while being read in another. In the case
of pigz an early cancellation will cause the reader to
close, resetting the buffer and signaling the process
to shut down, but races since the process must stop
reading before the reset otherwise the a panic may occur.
This fix guarantees that the bufio is always reset and
returned to the pool on the same goroutine that is
doing the read. If a buffer is not fully read the
buffered reader should just be discarded and not
returned back to the pool.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-26 18:11:30 -07:00