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

264 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
c63b541ab0 Merge pull request #123 from docker/oom 
Add oom support to events
 2016-02-29 17:02:56 -08:00
Michael Crosby
500ca74f38 Add oom support to events 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-29 17:01:40 -08:00
Michael Crosby
70a8c1ec3f Merge pull request #122 from jhowardmsft/closertoctrcompiling 
Getting ctr closer to compiling on Windows
 2016-02-29 14:20:08 -08:00
John Howard
d4ca79c978 Getting ctr closer to compiling on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-29 12:42:30 -08:00
Michael Crosby
8d2051232a Merge pull request #121 from mlaventure/only-send-live-if-needed 
Send "live" event only if past events requested
 2016-02-29 11:25:51 -08:00
Kenfe-Mickael Laventure
e8b602462a Send "live" event only if past events requested 
This fixes a bug where the live events are recorded in the events log.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-29 11:18:11 -08:00
Michael Crosby
c242792f21 Merge pull request #115 from docker/opts 
Various fixes and improvements
 2016-02-29 10:48:41 -08:00
John Howard
b044ff0f29 Refactor process.go for platform specific 
Signed-off-by: John Howard <jhoward@microsoft.com>

Move process sorter to new file

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Sort containers by id

This will not be the most accurate sorting but atleast the list will be
consistent inbetween calls.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Allow runtime to be configurable via daemon start

This allows people to pass an alternate name or location to the runtime
binary to start containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Fix state output for containers

Return the proper state/status for a container by checking if the pid is
still alive.  Also fix the cleanup handling in the shim to make sure
containers are not left behind.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Properly wait for container start

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-29 10:43:35 -08:00
Michael Crosby
0ad7654f80 Merge pull request #120 from jhowardmsft/nocrashonstartup 
Making it not crash on Windows
 2016-02-29 10:07:03 -08:00
John Howard
3d8e37cf9d Making it not crash on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-28 19:02:24 -08:00
Michael Crosby
b413f33b99 Merge pull request #118 from jhowardmsft/grpc 
Final bit of compiling on Windows
 2016-02-26 15:52:54 -08:00
John Howard
dd192f4cd9 Final bit of compiling on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-26 15:38:05 -08:00
Michael Crosby
cc6ba36498 Merge pull request #117 from jhowardmsft/supervisor 
Supervisor compiles on Windows
 2016-02-26 15:05:11 -08:00
John Howard
cdb5947f86 Supervisor compiles 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-26 14:58:15 -08:00
Michael Crosby
cc00a35bfc Merge pull request #116 from jhowardmsft/runtimecompiles 
runtime compiles on Windows
 2016-02-26 14:34:17 -08:00
John Howard
2b8f022950 runtime compiles on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-26 14:01:06 -08:00
Michael Crosby
ab74e7b2aa Merge pull request #112 from jhowardmsft/processsyscalls 
Refactor process.go for platform specific
 2016-02-26 11:04:19 -08:00
Michael Crosby
2644a7dfd5 Merge pull request #110 from jhowardmsft/factorgetrootids 
Refactors getRootIDs
 2016-02-26 11:04:05 -08:00
Michael Crosby
2868670ba6 Merge pull request #114 from mlaventure/events-stream-log-end-event 
Add a new "live" Event type
 2016-02-26 10:10:18 -08:00
Kenfe-Mickael Laventure
4ca592f56e Add a new "live" Event type 
This event type is used to notify consumers that everything following
are real-time events. This allow clients that request events from the
backlog to detect when those events have all been sent.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-25 16:39:54 -08:00
John Howard
1acf68535a Refactor process.go for platform specific 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-25 13:01:17 -08:00
John Howard
817c2089aa Refactors getRootIDs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-25 12:13:21 -08:00
Michael Crosby
3856e27560 Merge pull request #109 from jhowardmsft/fixosutils 
First step towards compiling on Windows
 2016-02-25 10:33:25 -08:00
John Howard
a9fdab9721 First step towards compiling on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-25 10:27:43 -08:00
Michael Crosby
44252266e7 Merge pull request #107 from mlaventure/fix-stats-cmd 
Fix stats command not returning
 2016-02-25 10:22:53 -08:00
Michael Crosby
7424c8bf1a Merge pull request #108 from mlaventure/ctr-new-commands 
Add pause, resume, watch command to ctr
 2016-02-25 10:22:48 -08:00
Kenfe-Mickael Laventure
b7042518e5 Fix stats command not returning 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-25 10:14:20 -08:00
Kenfe-Mickael Laventure
d8412061d2 Add watch command to ctr 
This command dump events matching a given container id or all events
if no id is provided.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-25 10:10:22 -08:00
Kenfe-Mickael Laventure
d0ab285704 Add resume command to ctr 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-25 10:10:05 -08:00
Kenfe-Mickael Laventure
450c8223e6 Add pause command to ctr 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-25 10:09:22 -08:00
Michael Crosby
a4eece0bd1 Merge pull request #100 from mlaventure/memory-limit-stats 
Memory limit stats
 2016-02-23 10:57:05 -08:00
Kenfe-Mickael Laventure
d8fce0997e Fill forgotten KernelUsage field of CgroupStats.MemoryStats 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-23 10:51:28 -08:00
Kenfe-Mickael Laventure
9f8e542234 Add Limit field to rpc MemoryStats.MemoryData 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-23 10:51:28 -08:00
Michael Crosby
a2461f1b6b Merge pull request #99 from mlaventure/system-usage-stats 
Add SystemUsage to returned stats
 2016-02-23 10:15:42 -08:00
Michael Crosby
67ad55ad56 Merge pull request #106 from docker/event-switch 
Remove eventloop package and use type switch
 2016-02-22 11:02:41 -08:00
Kenfe-Mickael Laventure
da5d876d91 Add SystemUsage to returned CpuStats 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-02-20 23:40:09 -08:00
Michael Crosby
4e05bf491a Remove eventloop package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-19 13:21:21 -08:00
Jaana Burcu Dogan
55c69b240f Merge pull request #105 from rakyll/notifier-docs 
Clarify chanotify docs about the usage of Add and Close
 2016-02-18 23:12:14 -08:00
Burcu Dogan
ae6b138363 Clarify chanotify docs about the usage of Add and Close 
Signed-off-by: Burcu Dogan <jbd@google.com>
 2016-02-18 20:42:39 -08:00
Michael Crosby
85c933087e Merge pull request #104 from rakyll/panic-if-dup-key 
Reject duplicate keys on the notifier
 2016-02-17 15:29:09 -08:00
Burcu Dogan
e3a6c2b9ea Reject duplicate keys on the notifier. 
Signed-off-by: Burcu Dogan <jbd@google.com>

mend
 2016-02-17 12:32:51 -08:00
Jaana Burcu Dogan
4de168877b Merge pull request #103 from docker/osutils 
Use a better package name for utility functions
 2016-02-16 15:20:41 -08:00
Jaana Burcu Dogan
8a8e29bb7b WNOHANG is not supported on windows. 2016-02-17 00:13:18 +01:00
Jaana Burcu Dogan
f611b37834 Use a better package name for utility functions. 2016-02-17 00:10:18 +01:00
Michael Crosby
8c38c931b0 Merge pull request #98 from docker/shim 
Containerd 0.5
 2016-02-12 15:52:13 -08:00
Michael Crosby
d19c818cdc Don't get pids on create 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-12 14:01:24 -08:00
Michael Crosby
1d8dc2a072 Fix time parsing from API default value 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-12 13:29:53 -08:00
Michael Crosby
7b182bd898 Remove name from container proto 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-12 13:08:38 -08:00
Michael Crosby
9341a95c26 add event log and timestamp to events api 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-12 10:17:59 -08:00
Michael Crosby
3dc59d565a Rename Events to task in supervisor 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-02-11 17:26:24 -08:00