github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lifubang
b3438f7a6f fix pipe in broken may cause shim lock forever for runtime v2 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-19 09:02:49 +08:00
Akihiro Suda
e1383c3d23
Merge pull request #2799 from BSWANG/patch-1 
Add build requirement doc on fedora/centos
 2018-11-17 13:05:22 +09:00
Phil Estes
d8621e258c
Merge pull request #2800 from crosbymichael/revert-dropped 
Revert v2 dropped events
 2018-11-17 09:01:58 +08:00
Michael Crosby
d48d7464ad
Merge pull request #2773 from crosbymichael/state-locking 
Fix process locking and state management
 2018-11-16 14:15:04 -05:00
Michael Crosby
ee41ce3f8c
Merge pull request #2788 from crosbymichael/runc-bump 
Update runc to 10d38b660a77168360df3522881e2dc2be
 2018-11-16 12:39:47 -05:00
Michael Crosby
956e49a36b Revert v2 dropped events 
Partial revert of #2748

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-16 11:34:15 -05:00
Julia Nedialkova
1d4105cacf Use named pipes for shim logs 
Relating to issue [#2606](https://github.com/containerd/containerd/issues/2606)

Co-authored-by: Oliver Stenbom <ostenbom@pivotal.io>
Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com>
Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Co-authored-by: Danail Branekov <danailster@gmail.com>

Signed-off-by: Oliver Stenbom <ostenbom@pivotal.io>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
Signed-off-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Signed-off-by: Danail Branekov <danailster@gmail.com>
 2018-11-16 16:11:43 +02:00
Bingshen Wang
581a63ce4e Add build requirement doc on fedora/centos 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-11-16 18:53:15 +08:00
Lifubang
01f5aa3878 add flag -d for ctr t exec to run a service in container 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:29:45 +08:00
Lifubang
51ad4d3020 change args usage for ctr c create 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:09:39 +08:00
Phil Estes
44b90df286
Merge pull request #2794 from wk8/wk8/nvidia_kmods 
Adding a --load-kmods flag to the NVIDIA OCI hook
 2018-11-16 11:50:37 +08:00
Lifubang
bd2a21985c fix container cmd args may parsed as ctr args 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-15 18:32:04 +08:00
Jean Rouge
90880078b9 Adding a --load-kmods flag to the NVIDIA OCI hook 
Signed-off-by: Jean Rouge <jer329@cornell.edu>
 2018-11-15 01:52:11 -08:00
Michael Crosby
e1a59ba0fb Update runc to 10d38b660a77168360df3522881e2dc2be 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-14 14:02:41 -05:00
Michael Crosby
a3c2f00c50
Merge pull request #2786 from jterry75/revendor_logrus 
Revendor github.com/sirupsen/logrus to v1.0.3
 2018-11-14 11:58:58 -05:00
Lantao Liu
7142de0fd2
Merge pull request #977 from Random-Liu/install-necessary-tools 
Only install necessary tools.
 2018-11-13 12:04:13 -08:00
Lantao Liu
5b21e63aed
Merge pull request #976 from Random-Liu/remove-health-monitor 
Remove the unused `health-monitor.sh`.
 2018-11-13 12:03:56 -08:00
Lantao Liu
77d55c5e60 Only install necessary tools. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-13 11:38:29 -08:00
Lantao Liu
ce51a102d4
Merge pull request #954 from mikebrow/go-version-update 
adds golang 1.11.x to build
 2018-11-13 11:36:42 -08:00
Lantao Liu
cfa8e06aee Remove the unused health-monitor.sh. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-13 11:21:51 -08:00
Justin Terry (VM)
8e25ca6bf0 Revendor github.com/sirupsen/logrus to v1.0.3 
logrus v1.0.3 was the first release that include the change in
terminal_windows.go that stops exec'ing "cmd ver" to obtain the version
information and rather uses the x/sys/crypto/terminal.IsTerminal on the
console fd. On Windows this is a significant performance difference to
avoid the additional process activation of the "cmd ver" for each
invocation of the shim/runhcs executables.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-13 09:27:29 -08:00
Lantao Liu
80554f4a85
Merge pull request #973 from Random-Liu/use-event-id 
Use the `ID` field of `TaskExit` event.
 2018-11-12 17:02:34 -08:00
Lantao Liu
6614992914
Merge pull request #974 from Random-Liu/remove-invalid-todo 
Remove invalid TODO comment.
 2018-11-12 17:02:10 -08:00
Lantao Liu
7f1f4e7a14 Remove invalid TODO comment. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-12 14:34:36 -08:00
Lantao Liu
47542c9515
Merge pull request #972 from Random-Liu/update-containerd-1.2 
Update containerd to v1.2.0.
 2018-11-12 14:31:02 -08:00
Lantao Liu
d4c825f905 Use the ID field of TaskExit event. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-12 14:30:27 -08:00
Lantao Liu
f818de9dce Update containerd to v1.2.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-12 11:12:41 -08:00
Evan Hazlett
0e7a70dbfb skip already exists content 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:48:18 +00:00
Evan Hazlett
6f2f4e4343 checkpoint: add copts to checkpoint; save snapshotter to annotation 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:48:16 +00:00
Evan Hazlett
40caece8dc update tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
4fdf720b84 move rw to opt; make snapshot opt; move to NewContainerOpts 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
147208061c add image name and runtime name media types; remove task operation on checkpoint 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
ce0673fd7d Restore take image 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
0e4d9da755 remove task handling from Restore 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:16 +00:00
Evan Hazlett
2d3db08daf refactor spec and snapshot restore into opts 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:45:22 +00:00
Evan Hazlett
45c700a955 refactor checkpoint and restore to client 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:45:22 +00:00
Phil Estes
c7896bd722
Merge pull request #2775 from jterry75/vendor_hcsshim 
Revendor github.com/Microsoft/hcsshim
 2018-11-10 14:13:28 -05:00
Phil Estes
f0bedbbd32
Merge pull request #2776 from thaJeztah/ignore_modprobe_failures 
Ignore modprobe failures in ExecStartPre (systemd unit)
 2018-11-10 14:09:40 -05:00
Sebastiaan van Stijn
555ea3fb43
Ignore modprobe failures in ExecStartPre (systemd unit) 
When running containerd inside LXC, due to systemd being unable to execute
`modprobe overlay` inside the container (module is already loaded in host kernel).

This patch adds a `-` prefix to the `ExecStartPre` command, so that failures
are ignored, and the service can start as usual.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-11-10 12:52:06 +01:00
Justin Terry (VM)
abd971cfbd Revendor github.com/Microsoft/hcsshim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-09 15:51:44 -08:00
Michael Crosby
96d30788e1
Merge pull request #2770 from Random-Liu/partial-revert-#2748 
Partially revert the event discard change in #2748.
 2018-11-09 15:57:33 -05:00
Michael Crosby
ed5a789889
Merge pull request #2771 from Ace-Tang/runtime_v2_add_id 
fix: fix failed to get container-shim relation with io.containerd.runc.v1
 2018-11-09 13:26:22 -05:00
Michael Crosby
831a41b958 Fix process locking and state management 
There were races with the way process states.  This displayed in ways,
especially around pausing the container for atomic operations.  Users
would get errors like, cannnot delete container in paused state and
such.

This can be eaisly reproduced with `docker` and the following command:

```bash
> (for i in `seq 1 25`; do id=$(docker create  alpine usleep 50000);docker start $id;docker commit $id;docker wait $id;docker rm $id; done)
```

This two issues that this fixes are:

* locks must be held by the owning process, not the state operations.
* If a container ends up being paused but before the operation
completes, the process exists, make sure we resume the container before
setting the the process as exited.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-09 11:40:37 -05:00
Ace-Tang
c4feaa75cf fix: fix failed to get container-shim relation with io.containerd.runc.v1 
add '-id' flag when start container with io.containerd.runc.v1 shim, or user
can not get container-shim relation from 'ps -ef',like

```
/usr/bin/containerd-shim-runc-v1 -namespace default -address
/run/containerd/containerd.sock -publish-binary /usr/bin/containerd
```

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-09 11:01:35 +08:00
Mike Brown
64b067d93f fix integration test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-11-08 17:53:47 -06:00
Lantao Liu
c524b9ce41 Partially revert the event discard change in #2748. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-08 14:47:32 -08:00
Mike Brown
bc97f51477 adds golang 1.11.x and tip to build 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-11-08 09:11:43 -06:00
Lantao Liu
edf2b81778
Merge pull request #969 from Random-Liu/golang-1.11-gofmt 
Update code for golang 1.11 gofmt.
 2018-11-08 00:21:04 -08:00
Lantao Liu
459e481808 Update code for golang 1.11 gofmt. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-07 16:08:58 -08:00
Phil Estes
130d07edd2
Merge pull request #2769 from fuweid/shim_related_change 
enhance: update v1/v2 runtime
 2018-11-07 10:30:03 -05:00