jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,279 Commits 5 Branches 25 Tags 17 MiB
Commit Graph

2279 Commits

Author SHA1 Message Date
Alexander Morozov c4e528889a Merge pull request #393 from crosbymichael/fix-opts-race 
Fix race setting process opts
 2015-11-09 10:26:13 -08:00
Michael Crosby 879dfdd980 Fix race setting process opts 
When starting and quering for pids a container can start and exit before
this is set.  So set the opts after the process is started and while
libcontainer still has the container's process blocking on the pipe.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-11-06 16:51:59 -08:00
Mrunal Patel 452e8a73c5 Integrate poststart hooks with spec 
* Call poststart hooks after the container is started
* Tie in with spec configuration

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-11-06 18:03:32 -05:00
Mrunal Patel bb2d3cd1be Add Poststart hook to libcontainer config 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-11-06 18:02:50 -05:00
Mrunal Patel 9f739e0429 Validate process configuration for runc exec 
We make sure that the args are present. All other items are optional and default to sensible values.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-11-06 14:08:50 -05:00
Qiang Huang 209c8d9979 Add some comments about cgroup 
We fixed some bugs and introduced some code hard to be
understood, add some comments for them.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-11-05 19:12:53 +08:00
Qiang Huang 8c98ae27ac Refactor cgroupData 
The former cgroup entry is confusing, separate it to parent
and name.
Rename entry `c` to `config`.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-11-05 19:12:53 +08:00
Qiang Huang a263afaf6c Rename parent and data 
'parent' function is confusing with parent cgroup, it's actually
parent path, so rename it to parentPath.

The name 'data' is too common to be identified, rename it to cgroupData
which is exactly what it is.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-11-05 19:12:53 +08:00
Mrunal Patel 83d7331acc Merge pull request #360 from jhowardmsft/jjh/container_interface 
Windows: Refactor Container interface
 2015-11-02 15:16:41 -08:00
John Howard a919bd3f67 Windows: Refactor Container interface 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-02 15:12:16 -08:00
Mrunal Patel c42a2952c4 Merge pull request #361 from jhowardmsft/jjh/criu_opts 
Windows: Factor down criu_opts
 2015-11-02 15:05:27 -08:00
Mrunal Patel 7caef5626b Merge pull request #359 from jhowardmsft/jjh/state_struct 
Windows: Refactor state struct
 2015-11-02 15:04:12 -08:00
Mrunal Patel cf73b32eeb Merge pull request #343 from hqhq/hq_unify_behavior_for_memory 
Unify behavior for memory cgroup
 2015-11-02 14:58:31 -08:00
Michael Crosby cca151c947 Merge pull request #375 from hqhq/hq_fix_systemd_readme 
README.md: fix description for runc with systemd
 2015-11-02 14:56:40 -08:00
Michael Crosby 26eb6a1bcd Merge pull request #377 from rhatdan/label 
Docker needs to know whether the user requested a relabel
 2015-11-02 14:55:27 -08:00
Mrunal Patel f0cd955927 Merge pull request #379 from duglin/cleanErrorCases 
Add more context around some error cases
 2015-10-31 09:59:24 -07:00
Doug Davis e5dc12a0c9 Add more context around some error cases 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-10-30 10:55:48 -07:00
Dan Walsh 69c3ea4e17 Docker needs to know whether the user requested a relabel 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2015-10-28 15:44:38 -04:00
Qiang Huang 826c92faed README.md: fix description for runc with systemd 
Fix the command and elaborate the instruction.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-28 04:21:39 -04:00
Qiang Huang d72c391402 README.md: clarify OCI JSON files 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-27 15:34:38 +08:00
John Howard fe1cce69b3 Windows: Refactor state struct 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-26 14:45:20 -07:00
Alexander Morozov db21ac7750 Merge pull request #355 from keloyang/nake 
Remove naked return
 2015-10-25 19:50:41 -07:00
Mrunal Patel 6c36d666a1 Merge pull request #365 from jhowardmsft/jjh/devices 
Windows: Tidy libcontainer\devices
 2015-10-24 19:36:26 -07:00
Mrunal Patel 0d155ba0fb Merge pull request #362 from jhowardmsft/jjh/configs-cgroup 
Windows: Refactor configs/cgroup.go
 2015-10-24 19:34:54 -07:00
Mrunal Patel 6d85c27599 Merge pull request #364 from jhowardmsft/jjh/fs-build-tags 
Fixes build tags on cgroups\fs\*.go
 2015-10-24 19:33:52 -07:00
John Howard 37675129ba Windows: Tidy libcontainer\devices 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 13:50:24 -07:00
Alexander Morozov 34fe03fa8a Merge pull request #238 from adrianreber/master 
Add criu related debug output
 2015-10-23 13:44:03 -07:00
John Howard fb5a8febce Fixes build tags on cgroups\fs\*.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 13:41:10 -07:00
Mrunal Patel b741e3dc9d Merge pull request #337 from alban/alban/stdio 
libcontainer/SPEC.md: fix /dev/stdio symlinks
 2015-10-23 13:40:56 -07:00
John Howard 8690e9cc8c Windows: Refactor configs/cgroup.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 13:08:18 -07:00
John Howard 78351a8e3d Windows: Factor down criu_opts 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 12:58:59 -07:00
Mrunal Patel bed70ca579 Merge pull request #358 from rajasec/exit-typo 
Fixing typo in the comment for exit
 2015-10-23 11:12:17 -07:00
Alexander Morozov 989c4ba181 Merge pull request #354 from heavenlyhash/remove-unused-func 
Remove fatalf function; unused.
 2015-10-23 11:03:42 -07:00
Alexander Morozov 97929bd6dd Merge pull request #335 from crosbymichael/cgroup-order 
Add name to cgroup subsystem and set order
 2015-10-23 10:38:29 -07:00
Michael Crosby 89c0345b01 Merge pull request #345 from keloyang/arch 
Add the conversion of architectures for seccomp config
 2015-10-23 10:25:41 -07:00
yangshukui e5ef8d239a Add the conversion of architectures for seccomp config 
Signed-off-by: yangshukui <yangshukui@huawei.com>
 2015-10-23 10:17:39 +08:00
rajasec 58e3cde8f3 Fixing typo in the comment for exit 
Signed-off-by: rajasec <rajasec79@gmail.com>
 2015-10-22 19:08:03 +05:30
yangshukui 4584a4e762 Remove naked return 
Signed-off-by: yangshukui <yangshukui@huawei.com>
 2015-10-22 14:31:15 +08:00
Eric Myhre 01d9b4002e Remove fatalf function; unused. 
Signed-off-by: Eric Myhre <hash@exultant.us>
 2015-10-21 19:22:14 -05:00
Mrunal Patel 2a6ae44f8e Merge pull request #352 from hqhq/hq_change_setupdev 
Correct intuition for setupDev
 2015-10-21 09:54:10 -07:00
Alban Crequy f381717120 libcontainer/SPEC.md: fix /dev/stdio symlinks 
The spec uses symlinks to "/proc/1/..." but the implementation uses
"/proc/self/...": see setupDevSymlinks (libcontainer/rootfs_linux.go).

The implementation is more correct, so I'm changing the spec to match
the implementation.

Signed-off-by: Alban Crequy <alban.crequy@coreos.com>
 2015-10-21 11:10:24 +02:00
Qiang Huang 34cff6f2f3 Correct intuition for setupDev 
Minor fix, the former setupDev=true means not setup dev,
which is contrary to intuition, just correct it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-21 16:06:26 +08:00
Qiang Huang 194e0e4db6 Unify behavior for memory cgroup 
We have a rule that for optional cgroups, don't fail if some
of them are not mounted, but we want it fail hard when a
user specifies an option and we are unable to fulfill the
request.

Memory cgroup should also follow this rule.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-20 14:01:48 +08:00
Michael Crosby ba2ce3b25a Cgroup set order for systemd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-10-19 13:32:45 -07:00
Michael Crosby 2554f49d5e Use array instead of map for cgroup subsystems 
Also add cpuset as the first in the list to address issues setting the
pid in any cgroup before the cpuset is populated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-10-15 15:24:53 -07:00
Michael Crosby 02fdc70837 Add Name() to cgroup subsystems 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-10-15 15:19:23 -07:00
Mrunal Patel 3be7f87b1b Merge pull request #334 from hqhq/hq_set_cpus_mems_first 
Set cpuset.cpus and cpuset.mems before join the cgroup
 2015-10-15 14:33:28 -07:00
Qiang Huang be6764508e Set cpuset.cpus and cpuset.mems before join the cgroup 
It can avoid unnecessary task migrataion, see this scenario:
 - container init task is on cpu 1, and we assigned it to cpu 1,
   but parent cgroup's cpuset.cpus=2
 - we created the cgroup dir and inherited cpuset.cpus from parent as 2
 - write container init task's pid to cgroup.procs
 - [it's possibile the container init task migrated to cpu 2 here]
 - set cpuset.cpus as assigned to cpu 1
 - [the container init task has to be migrated back to cpu 1]

So we should set cpuset.cpus and cpuset.mems before writing pids
to cgroup.procs to aviod such problem.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-15 11:16:56 +08:00
Mrunal Patel 7a95a531ba Merge pull request #333 from heavenlyhash/configurable-logfmt 
Add ability to use json structured logging format.
 2015-10-14 11:23:10 -07:00
Eric Myhre 2add2bc41a Add ability to use json structured logging format. 
Signed-off-by: Eric Myhre <hash@exultant.us>
 2015-10-13 22:57:07 -05:00