github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,956 Commits 3 Branches 2 Tags 112 MiB
13bd93847d
Commit Graph

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
31845714ef
Merge pull request #564 from Random-Liu/update-containerd 
Update containerd to 4812f4be8f.
 2018-01-23 14:10:21 -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
Lantao Liu
1c2fef9f68
Merge pull request #563 from Random-Liu/disable-dad 
Disable IPv6 dad by default.
 2018-01-22 17:32:54 -08:00
Lantao Liu
dd125be836 Update containerd to 4812f4be8f. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-23 00:08:27 +00:00
Lantao Liu
2b6f084f36 Disable IPv6 dad by default. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-22 23:54:16 +00: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
Phil Estes
e78c77fd2b
Add Golang issue link re: -trimpath to Makefile 
Per the request in #2021, add a link to the issue in case this situation
changes in the future.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-01-22 15:30:31 -05:00
Michael Crosby
e9432a7900
Merge pull request #2021 from kunalkushwaha/trimpath 
trim code path in stack trace.
 2018-01-22 15:25:11 -05:00
Phil Estes
352178a56a
Merge pull request #2035 from stevvooe/makefile-ordering 
Makefile: ensure that `containerd-shim` gets added when installing
 2018-01-22 15:14:02 -05:00
Stephen J Day
fe5da18f70
Makefile: ensure that containerd-shim gets added when installing 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-01-22 11:48:27 -08:00
Michael Crosby
e5740ca612
Merge pull request #2007 from AkihiroSuda/cio-fifo-path 
cio: add WithFIFODir opt
 2018-01-22 13:32:43 -05:00
Michael Crosby
4812f4be8f
Merge pull request #2030 from Random-Liu/print-plugin-default-config 
Print default plugin config.
 2018-01-22 11:12:20 -05:00
Kunal Kushwaha
ad4f265497 trim code path in stack trace. 
Added -trimpath flag in -gcflags to reduce codepath in stack trace.
Fixes #2000

In case of multiple GOPATH, it will trimpath of first one

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-01-22 11:03:49 +09:00
Lantao Liu
6bb567d6a2
Merge pull request #557 from Random-Liu/use-containerd-config 
Use containerd config
 2018-01-21 00:50:56 -08:00
Stephen Day
d5aa7655e2
Merge pull request #2032 from crosbymichael/stress-exec 
Add execs to stress tests
 2018-01-19 16:23:55 -08:00
Lantao Liu
3d6fe5ad18 Print default plugin config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-19 22:51:32 +00:00
Michael Crosby
94602aea63 Add execs to stress tests 
This improves the exec support so that they can run along with the
normal stress tests.  You don't have to pick exec stres or container
stress.  They both run at the same time and report the different values.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-19 13:44:54 -05:00
Lantao Liu
4e9ca399e1 Use containerd plugin config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-19 02:25:03 +00:00
Lantao Liu
9449892561
Merge pull request #555 from Random-Liu/move-cgroup-oom-to-cmd 
Move cgroup oom to cmd
 2018-01-18 18:24:42 -08:00
Lantao Liu
7d18d61674 Move cgroup and oom score setting to cmd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-19 01:35:36 +00:00
Kenfe-Mickaël Laventure
823d3398ea
Merge pull request #2023 from crosbymichael/exec-state 
Add Exec to process states
 2018-01-18 14:48:38 -08:00
Michael Crosby
2a730264aa Add Exec to process states 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-18 17:05:15 -05:00
Lantao Liu
74d8880032
Merge pull request #552 from Random-Liu/use-containerd-grpc-server 
Use containerd grpc server
 2018-01-18 12:36:05 -08:00
Michael Crosby
ba84c5fb38
Merge pull request #2019 from stevvooe/remove-log-modules 
log: remove log "module" system
 2018-01-18 14:34:51 -05:00
Stephen J Day
5cab90d270
log: remove log "module" system 
After comtemplation, the complexity of the logging module system
outweighs its usefulness. This changeset removes the system and restores
lighter weight code paths. As a concession, we can always provide more
context when necessary to log messages to understand them without having
to fork the context for a certain set of calls.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-01-18 11:22:13 -08:00
Lantao Liu
a9d846af23 Upgrade test framework to talk to containerd sock. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 18:51:18 +00:00
Lantao Liu
62e6921145 Use containerd grpc server 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 18:51:18 +00:00
Lantao Liu
87f73a6b5d
Merge pull request #554 from Random-Liu/minor-cleanup 
Minor code cleanup.
 2018-01-18 10:29:21 -08:00
Michael Crosby
e1321c51a6
Merge pull request #2022 from denverdino/master 
Fix NPE in dialer
 2018-01-18 13:18:34 -05:00
Li Yi
adfa9a2402 Fix NPE in dialer 
Signed-off-by: Li Yi <denverdino@gmail.com>
 2018-01-18 18:41:24 +08:00
Lantao Liu
6fadb7f5e9 Minor code cleanup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 07:31:16 +00:00
Akihiro Suda
507a149488 cio: add WithFIFODir opt 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-01-18 14:33:56 +09:00
Lantao Liu
ca3b73899a
Merge pull request #547 from Random-Liu/glog-to-logrus 
glog to logrus
 2018-01-17 19:26:31 -08:00
Stephen Day
acc6011ac1
Merge pull request #1960 from dmcgowan/images-removal-dirty 
metadata: image removal triggers GC
 2018-01-17 13:58:39 -08:00
Lantao Liu
144ff3989b Update all glog flags to log-level. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
3d68005c04 Replace glog with logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
383a89b948 Add flags and utils for logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Phil Estes
80fc1f2d07
Merge pull request #2011 from darrenstahlmsft/ResolveErrors 
Provide better error context on resolve failures
 2018-01-17 16:42:40 -05:00
Darren Stahl
1338a4f022 Provide better error context on resolve failures 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2018-01-17 13:22:54 -08:00