Commit Graph

8706 Commits

Author SHA1 Message Date
Michael Crosby
18a8a061cc
Merge pull request #2971 from jterry75/runhcs_shim_exec_deadlock
Fix deadlock in Windows runhcs shim exec
2019-02-01 14:34:57 -05:00
Justin Terry (VM)
dfcc5942f1 Fix deadlock in Windows runhcs shim exec
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-02-01 10:58:01 -08:00
Nikhil Soni
da2ab865e0 Add documentation for using namespace labels for configuring defaults.
Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-02-01 23:14:33 +05:30
Lantao Liu
952d58297d Add a separate lock for pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-01 08:48:26 -08:00
Lantao Liu
9777d76890 Revert "use state machine management for exec.Pid()"
This reverts commit bbc2a995f9.

Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-31 18:59:34 -08:00
Nikhil Soni
34323985a1 Use labels only when default namespace is provided and prefer given
options.

Implements same approach of setting defaults for `NewWithConn`.

Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-01-30 23:21:24 +05:30
Nikhil Soni
59432aaecf Take default runtime and snapshotter from namespace labels
Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-01-30 23:21:24 +05:30
Phil Estes
f7f24e2f3a
Merge pull request #2967 from nitkon/patch-1
BUILDING: update BUILDING.md
2019-01-30 16:15:15 +00:00
Michael Crosby
118d321cca
Merge pull request #2961 from jterry75/fix_typo_path
Fix bug in shim path lookup
2019-01-30 11:11:55 -05:00
Nitesh Konkar
6629f853a7 BUILDING: update BUILDING.md
Improve documentation

Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
2019-01-30 18:40:27 +05:30
Lantao Liu
dd2846d941
Merge pull request #1035 from Random-Liu/add-runtime-option
Add RUNTIME env in integration and cri test.
2019-01-29 18:50:02 -08:00
Phil Estes
e26f442aca
Merge pull request #2963 from fuweid/remove-noop-loop
metadata/gc: remove the noop-loop for snapshot reference
2019-01-29 20:52:10 +00:00
Phil Estes
77d7b01233
Merge pull request #2962 from ostenbom/snapshots-docs
Update snapshots docs with garbage collector label
2019-01-29 20:50:40 +00:00
Michael Crosby
7fd3d02ff6
Merge pull request #2920 from Random-Liu/max-concurrent-download
Add image pull concurrency limit.
2019-01-29 15:05:01 -05:00
Lantao Liu
d7ed403072 Add image pull concurrency limit.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-29 10:27:05 -08:00
Michael Crosby
5abeeff84f
Merge pull request #2647 from teawater/gdb
Add build option "GODEBUG=1"
2019-01-29 12:04:05 -05:00
Oliver Stenbom
7f5d7ff6b8 Update snapshots docs with garbage collector label
Signed-off-by: Oliver Stenbom <oliver@stenbom.eu>
2019-01-29 15:37:56 +00:00
Wei Fu
34672d483d metadata/gc: remove the noop-loop for snapshot reference
The noop-loop does nothing.

The containerd doesn't have any snapshotter buckets at the beginning.
If user uses specific dir as rootfs to create container, and sets
`snapshotter` key to the container, like `overlayfs` by mistake,
the gc scheduler will try to scan the snapshotter and panic.

In order to avoid this case, remove the noop-loop here.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-01-29 19:11:28 +08:00
Justin Terry (VM)
6ed293ba94 Fix bug in shim path lookup
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 14:04:14 -08:00
Michael Crosby
f35c3527b2
Merge pull request #2960 from jterry75/shim_windows_lookpath
Add support for containerd shim activation's within the same folder not in PATH
2019-01-28 16:26:12 -05:00
Justin Terry (VM)
d63099c4a6 Allow matching shim path side by side with containerd
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 12:49:14 -08:00
Justin Terry (VM)
764afa0d18 Include extension for shim binary format on Windows
Use full name including extension for shim binary format on Windows in order to
match any stat path faster without a fallback.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 12:42:08 -08:00
Lantao Liu
0bd90a77ef Add RUNTIME env in integration and cri test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-28 11:06:20 -08:00
Phil Estes
4259f63e04
Merge pull request #2959 from Quasilyte/patch-1
remove excessive []byte(s) conversion
2019-01-28 12:17:42 -05:00
Iskander (Alex) Sharipov
dfebb404cb
remove excessive []byte(s) conversion
`copy` permits using to mix `[]byte` and `string` arguments without
explicit conversion. I removed explicit conversion to make the code simpler.

Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
2019-01-28 19:50:28 +03:00
Mike Brown
90492e9e70
Merge pull request #1034 from fuweid/cleanup
hack: handle additional cleanup from #1028
2019-01-25 20:13:26 -06:00
Wei Fu
c019ae8b21 hack: handle additional cleanup from #1028
remove the `unset` in the script.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-01-26 09:38:16 +08:00
Phil Estes
9f705f40b8
Merge pull request #2958 from crosbymichael/runcv2-events
Move task events to runc v2 shim
2019-01-25 16:24:01 -05:00
Michael Crosby
85aa8ad361 Move task events to runc v2 shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-01-25 14:15:43 -05:00
Lantao Liu
538a361b3a
Merge pull request #1028 from fuweid/detect-dirty-vendor
hack/Makefile: detect dirty vendor
2019-01-25 10:33:41 -08:00
Phil Estes
9aac018896
Merge pull request #2957 from Random-Liu/update-cri
Update cri to 4dd6735020.
2019-01-25 12:41:07 -05:00
Phil Estes
a54d649339
Merge pull request #2956 from jterry75/runhcs_vendor_update
Revendor github.com/Microsoft/hcsshim v0.8.4
2019-01-25 12:40:24 -05:00
Phil Estes
f63d28984c
Merge pull request #2939 from jterry75/bug_publishstart
Implement the Runtime v2 Shim async task model for runhcs
2019-01-25 12:39:48 -05:00
Lantao Liu
28f8a90bd7 Update cri plugin to 4dd6735020.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-24 18:38:09 -08:00
Wei Fu
119222016f hack/Makefile: detect dirty vendor
use containerd/project script to detect dirty vendor.

close: #1012

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-01-25 10:10:43 +08:00
Lantao Liu
4dd6735020
Merge pull request #1029 from Random-Liu/add-runtime-config-api
Add a generic runtime options api.
2019-01-24 17:36:20 -08:00
Justin Terry (VM)
bb32c0f619 Revendor github.com/Microsoft/hcsshim v0.8.4
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-24 13:46:07 -08:00
Lantao Liu
5d1a07e86c
Merge pull request #1032 from Random-Liu/small-code-cleanup
Don't use string when there is a constant.
2019-01-24 12:58:16 -08:00
Lantao Liu
9a455daf4d Don't use string when there is a constant.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-24 11:45:16 -08:00
Lantao Liu
bf00de33a5
Merge pull request #1025 from JoeWrightss/patch-4
Fix some typos in comment
2019-01-24 11:17:33 -08:00
Lantao Liu
97c7a1b17b
Merge pull request #1027 from Random-Liu/fix-log-ending-newline
Fix the log ending newline handling.
2019-01-24 10:22:03 -08:00
Phil Estes
acdb225c2b
Merge pull request #2952 from crosbymichael/interrupt-return
Return out of windows signal handler
2019-01-24 08:18:18 -05:00
Lantao Liu
d9914c8dbd Always fallback to the new runtime options.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-24 00:59:02 -08:00
Lantao Liu
42aba00a31 Add runtime config api.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-24 00:59:02 -08:00
Lantao Liu
556b219450 Fix lint error.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-23 18:14:34 -08:00
Lantao Liu
879dc6ae25 Add integration test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-23 18:14:34 -08:00
Lantao Liu
50ac40097e Fix the log ending newline handling.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-23 17:23:13 -08:00
Michael Crosby
f444696989 Return out of windows signal handler
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-01-23 16:06:49 -05:00
Derek McGowan
3762378760
Merge pull request #2944 from Random-Liu/fix-stdin-close
Don't cancel context passed to `OpenFifo`.
2019-01-23 10:51:12 -08:00
Michael Crosby
09029eb294
Merge pull request #2949 from justincormack/chtimes_osx
unix.UtimesNanoAt now supported on Darwin and sets nanosecond precision if filesystems does
2019-01-23 13:22:34 -05:00