vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity
1010 commits 2 branches 0 tags 33 MiB
Commit graph

1010 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kenfe-Mickael Laventure
85050da1e0 Update ExitStatusFile correctly if process died while daemon was down 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-16 13:30:16 -07:00
Kenfe-Mickael Laventure
18c76025a1 Wait for all exec process child before exiting from shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-16 13:30:16 -07:00
Kenfe-Mickael Laventure
920a9c21d7 Don't hog task queue while waiting for exec process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-16 13:30:16 -07:00
Michael Crosby
578bf0c70e Merge pull request #314 from mikedanese/update-grpc 
update grpc dependency to v1.0.1-GA
 2016-09-14 10:49:10 -07:00
Mike Danese
3492af35ba grpc: regenerate protos and adjust for new package API 
Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-09-12 11:37:24 -07:00
Mike Danese
ea36fe0bb7 vendor: update grpc to v1.0.1-GA 
The currently used go-grpc client is rather old (a commit from May).
Since then a GA release has been cut, so let's use that.

Signed-off-by: Mike Danese <mikedanese@google.com>
 2016-09-12 11:36:39 -07:00
Kenfe-Mickaël Laventure
4c21ad662f Merge pull request #316 from mlaventure/add-missing-printf-arg 
Add missing printf parameter when starttime write fails
 2016-09-12 09:39:44 -07:00
Kenfe-Mickael Laventure
f7de90516f Add missing printf parameter when starttime write fails 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-12 09:32:51 -07:00
Kenfe-Mickaël Laventure
ddf95cb0fb Merge pull request #315 from LK4D4/add_health_check 
Add grpc health check service
 2016-09-12 07:37:32 -07:00
Alexander Morozov
d5f9910cee Add grpc health check service 
Also, block on dial in integration tests

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
 2016-09-09 13:14:47 -07:00
Michael Crosby
35a736c471 Merge pull request #313 from mlaventure/handle-sigkilled-shim-the-return 
Handle shim being sigkilled while containerd is down
 2016-09-08 14:48:52 -07:00
Kenfe-Mickael Laventure
3281909583 Handle shim being sigkilled while containerd is down 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-08 14:37:55 -07:00
Michael Crosby
b6b2fd623e Merge pull request #311 from mlaventure/handle-sigkilled-shim 
Handle sigkilled shim
 2016-09-07 10:45:37 -07:00
Kenfe-Mickael Laventure
fe5f3d5581 Add proper handling for SIGKILL'ed shim 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-07 10:30:02 -07:00
Kenfe-Mickael Laventure
dd71165fc6 Fix position of $(TESTFLAGS) in Makefile 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-07 10:30:02 -07:00
Kenfe-Mickaël Laventure
3a65d238a9 Start runc in detached mode when restoring a checkpoint (#312) 
Without this the shim cannot detect the death of the init process.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-07 09:26:37 -07:00
Kenfe-Mickaël Laventure
4f0a33ac3d Dump runtime stacks on USR1 reception (#292) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-08-30 09:47:21 -07:00
Yu, Zou
79c7673858 add more blkio subsystem parameters to control according to ones provided by runc. (#304) 
Signed-off-by: Yu Zou <zouyu7@huawei.com>
 2016-08-26 11:07:45 -07:00
Kenfe-Mickaël Laventure
526a861988 Avoid panicing if cmd.Start() from container.createCmd() failed (#305) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-08-26 10:56:18 -07:00
K3A
403ccb155b Update Makefile (#303) 
adding LDFLAGS for "shim" target as well.

Signed-off-by: Mario Hros <spam@k3a.me>
 2016-08-26 10:55:21 -07:00
Phil Estes
8508d2bec9 Don't call runc start when restoring a checkpoint (#302) 
The create/start split left checkpoint/restore broken in that the create
side was calling runc restore, which fully restores the process to
operation, leaving a call to `runc start` as an error (process already
started). This patch skips process.Start as it is an unnecessary (and
wrong) step for a restored checkpoint.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2016-08-26 10:25:19 -07:00
Michael Dougherty
edc124c8e7 Initial jenkinsfile (#306) 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2016-08-26 10:24:30 -07:00
Damien Lespiau
d77bc40d5c shim: Fix description of cwd and arguments given to the shim process (#307) 
That comment didn't seem to match the reality and confused me a bit. The
shim takes 3 arguments and the cwd is the containerd state directory.

I'm guessing it's a left over from the containerd split.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
 2016-08-26 09:41:11 -07:00
Damien Lespiau
ab90816c41 A few .gitignore updates (#308) 
* gitignore: Use absolute paths

git status will only match the ignored path from the root of the
repository, a very slightly more accurate way to ignore those files.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

* gitignore: Ignore the /output directory

Test artifacts are now generated in /output, so update the .gitignore
file accordingly.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
 2016-08-26 09:40:41 -07:00
Lei Jitang
95d78cad59 Remove obsolete comment about reaper in containerd/main.go (#297) 
Sigchld reaper has been removed from containerd procss in
847690583f, so the comment
is not need any more.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-08-15 09:54:47 -07:00
Kenfe-Mickaël Laventure
621f263475 Merge pull request #296 from crosbymichael/bump 
Update version to 0.2.3
 2016-08-10 09:06:47 -07:00
Michael Crosby
973f21fcad Update version to 0.2.3 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-10 08:59:47 -07:00
Stephen J Day
deb62729ba log: add testing for context logger 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-08-02 18:00:48 -07:00
Stephen J Day
5288d8f9fe log: improve module-oriented logging 
To improve the output of module logging, we now include a path that
represents the modules that a context has passed through. This makes it
easy to tell if a log line came from a particular module hierarchy.

A helper function, `WithModule`, provides an easy way to mark a context
with a module and inject that module into the logger.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-08-02 16:41:49 -07:00
Kenfe-Mickaël Laventure
0ac3cd1be1 Fix shim deadlock when joining an existing pid namespace (#290) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-15 11:49:43 -07:00
Kenfe-Mickaël Laventure
3abb9fc411 Merge pull request #289 from resouer/minor-fix 
Fix wrong name comment etc
 2016-07-14 09:26:25 -07:00
Harry Zhang
9df37c23e4 Fix wrong field name 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-07-14 17:06:01 +08:00
Kenfe-Mickaël Laventure
90f827ca10 Streamline events (#287) 
* Sync process.State() with the matching events

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Allow requesting events for a specific container

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Sync container state retrieval with other events

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Let containerd take care of calling runtime delete on exit

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

* Take care of possible race in TestBusyboxTopExecTopKillInit

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-13 11:01:07 -07:00
Kenfe-Mickaël Laventure
6dd2f1c422 Merge pull request #281 from mlaventure/use-protobuf-timestamp 
Use protobuf timestamp
 2016-07-05 13:37:41 -07:00
Kenfe-Mickaël Laventure
ef23e7041b Merge pull request #280 from resouer/minor-fix 
Refactoring minor fix
 2016-07-05 11:27:18 -07:00
Kenfe-Mickaël Laventure
af3c4bd9c5 Merge pull request #276 from resouer/fix-fd 
Fix controlPipe is not closed
 2016-07-05 11:25:07 -07:00
Kenfe-Mickaël Laventure
3104c6b537 Merge pull request #284 from coolljt0725/set_default_shim 
set default shim if shim is nil for backward compatibility
 2016-07-05 11:23:53 -07:00
Kenfe-Mickaël Laventure
c26f5ef94b Merge pull request #283 from coolljt0725/fix_attach 
Fix attach to old running container after restart
 2016-07-05 10:11:45 -07:00
Lei Jitang
0b15e03da0 set default shim if shim is nil for backward compatibility 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-05 09:14:20 -04:00
Lei Jitang
bce8df5498 Fix attach to old running container after restart 
Get the control pipe of old running container on
containerd restarting.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-04 04:19:18 -04:00
Kenfe-Mickaël Laventure
1b3a81545c Merge pull request #282 from mlaventure/fix-race-in-process-start 
Handle case where shim is reaped before the call to the runtime start
 2016-07-01 11:39:34 -07:00
Kenfe-Mickael Laventure
d8b9559d8e Handle case where shim is reaped before the call to the runtime start 
This avoid erroring out with a false positive

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-01 11:26:20 -07:00
Kenfe-Mickael Laventure
dfb626dccc Use protobuf Timestamp type instead of uint64 
This will ensure nanoseconds are taken in account.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-01 09:37:21 -07:00
Harry Zhang
96ee432674 Refactoring minor fix 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-06-30 23:13:04 -04:00
Kenfe-Mickael Laventure
3dfa04b2f4 Log runtime error message on delete error 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-30 14:09:04 -07:00
Harry Zhang
2ef56b2ee8 Fix fd leak 
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Signed-off-by: Harry Zhang <harryz@hyper.sh>
 2016-06-29 03:35:27 -04:00
Kenfe-Mickaël Laventure
2e4e484237 Stop creating /tmp/shim-delete-<pid> as noone uses it (#278) 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-06-28 11:52:52 -07:00
Kenfe-Mickaël Laventure
b93a33be39 Merge pull request #274 from crosbymichael/start-sync 
Call start in containerd
 2016-06-27 11:11:31 -07:00
Michael Crosby
654c537d38 Call start in containerd 
This fixes a sync issue when the containerd api returns after a
container has started.  It fixes it by calling the runtime start inside
containerd after the oom handler has been setup.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-06-27 10:49:20 -07:00
Kenfe-Mickaël Laventure
14e79494da Merge pull request #272 from liubin/fix-typos 
Fix typos
 2016-06-22 07:30:48 -07:00