dd3cb88223
Merge pull request #417 from HuKeping/master
...
cgroups: add support for oom control
2015-03-06 08:31:40 -08:00
4332ffcfc6
cgroups: add test for disable oom killer
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-03-07 02:49:34 +08:00
295c70865d
cgroups: add support for oom control
...
This patch add support for diable OOM Killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-03-07 02:49:31 +08:00
334b196371
Merge pull request #432 from LK4D4/os_environ
...
Pass os.Environ() as environment to process from init.
2015-03-05 14:49:24 -08:00
9744d72c74
Pass os.Environ() as environment to process from init.
...
Replacement of #418
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-05 14:44:40 -08:00
d4867a6583
Merge pull request #431 from LK4D4/fix_nsenter_test_hang
...
Remove overcomplicated logic of SIGCHLD from TestNsenterDeadPid
2015-03-05 13:58:47 -08:00
846e522ffc
Remove overcomplicated logic of SIGCHLD from TestNsenterDeadPid
...
It lead to some race which hanged test.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-05 13:52:54 -08:00
88989e66d3
Merge pull request #427 from avagin/fixes
...
A few minor fixes
2015-03-04 21:36:46 -08:00
872663148e
paranoia: Don't return -1 as PID in error cases
...
I have seen a few times, when kill() was called for this
value on error paths and nobody survived except the init process.
man 2 kill
If pid equals -1, then sig is sent to every process for which the call‐
ing process has permission to send signals, except for process 1
(init), but see below.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-03-05 08:07:33 +03:00
38f729e577
Merge pull request #428 from LK4D4/exec_tty
...
Add tty support for setnsProcess
2015-03-04 17:55:55 -08:00
a9644c209f
Add tty support for setnsProcess
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-04 17:30:37 -08:00
a72f710d89
configs: check that config doesn't contain extra fields
...
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-03-05 00:26:33 +03:00
f78bf211f0
integration: don't use default values to test smth
...
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-03-04 23:31:54 +03:00
1c9de5b4d2
Merge pull request #423 from mrunalp/test_env
...
Adds an integration test for checking process env.
2015-03-04 11:13:48 -08:00
0e3b1262a1
Adds an integration test for checking process env.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-04 13:58:42 -05:00
11d14f2621
Merge pull request #425 from hqhq/hq_use_set_in_freeze
...
cgroups: use Set instead of Apply in Freeze
2015-03-04 10:13:46 -08:00
b49bd705dc
Merge pull request #426 from MabinGo/file_check
...
Add the file close operation before function return to release resource
2015-03-04 09:26:01 -08:00
c1fb904d10
Add the file close operation before function return to release resource
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-04 14:56:50 +08:00
a8a798a7c9
cgroups: use Set instead of Apply in Freeze
...
So Apply function of freezer can be as sample as other subsystems.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 13:45:44 +08:00
903680701a
Merge pull request #424 from dqminh/fix-generic-error
...
Fix panic when genericError constructor gets nil error
2015-03-03 20:11:37 -08:00
3ca0e1ff95
Merge pull request #376 from hqhq/hq_add_set_interface
...
add a new api Set
2015-03-03 19:57:55 -08:00
e22b589543
genericError constructors can accept nil error
...
if the error is nil, we do not populate generic error's message, but the
constructor will still return a valid error
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-03-03 22:47:44 -05:00
4ce8d97320
do not pass nil to genericError
...
currently genericError constructors require not-nil error to be able to read
its Error() message
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-03-03 22:47:44 -05:00
4077c254a6
add test cases for Set interfaces
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:43:59 +08:00
74005ed4e0
add function to get string value from cgroup file
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:42:56 +08:00
1db687f4f4
add Set api
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:42:35 +08:00
cc524f1b72
add Set interface
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:42:04 +08:00
12a63757db
rename Set to Apply
...
The name `Set` would be used to do dymanic changes of resource configs
in the future. For now, `Apply` also makes more sense.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:37:55 +08:00
025e6be6c5
Merge pull request #421 from LK4D4/network_interface_stats
...
Make NetworkInterface public
2015-03-03 11:50:15 -08:00
2cd0ee8cf2
Make NetworkInterface public
...
In other case it is impossible to implement Stats() method from
interface outside libcontainer.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-03 11:07:21 -08:00
6c2f20eeec
Merge pull request #420 from LK4D4/systemd_stats
...
Implement stats for systemd
2015-03-03 08:39:34 -08:00
dd5576b2b3
Implement stats for systemd
...
It looks weird but works and not crashes application.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-02 14:36:09 -08:00
56bc1485df
Merge pull request #419 from LK4D4/return_init_err_on_setns
...
Return init errors from setnsProcess
2015-03-02 13:51:08 -08:00
152107f44a
Return init errors from setnsProcess
...
Before it produced panic or hanging
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2015-02-27 15:55:53 -08:00
0dee9793d5
Merge pull request #416 from LK4D4/fix_mount_join
...
Don't join rootfs if path already prefixed by it
2015-02-26 14:59:48 -08:00
087caf69e8
Don't join rootfs if path already prefixed by it
...
In docker we evaluate all symlinks im path to check that they not escaping
from rootfs and that gives us full path to mount.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-26 13:08:15 -08:00
bcfdee970e
Merge pull request #414 from jfrazelle/jessfraz-has-been-shamed-for-life
...
Fixes validate
2015-02-26 09:37:21 -08:00
3c474b9e2a
Fixes validate
...
I'm the worst, shame, shame, shame has been brough unto my family
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-02-26 09:36:29 -08:00
b48acf4613
Merge pull request #410 from hqhq/fix_README
...
fix instructions in README
2015-02-26 09:12:26 -08:00
8d0f911e1d
Merge pull request #395 from jfrazelle/add-validate-script
...
Add a validate script
2015-02-26 09:11:58 -08:00
20af7e70e2
fix instructions in README
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-26 15:02:31 +08:00
9d91f080ce
Merge pull request #409 from hqhq/rename_test_files
...
rename test files so we can really test them
2015-02-25 19:09:23 -08:00
53fce30755
rename test files so we can really test them
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-26 09:49:57 +08:00
b19b8a9677
Merge pull request #407 from LK4D4/move_console_to_process
...
Move tty configuration to Process
2015-02-25 15:08:47 -08:00
8d0b06257b
Move tty configuration to Process
...
Now you need to call Process.NewConsole to setup console for process
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 15:04:43 -08:00
f6593810da
Merge pull request #400 from mrunalp/exit_cleanup
...
Exit related cleanup
2015-02-25 13:18:27 -08:00
fff015f409
Merge pull request #406 from LK4D4/return_state_on_err
...
Return actual ProcessState on Wait error
2015-02-25 13:18:18 -08:00
d1f0d5705d
Return actual ProcessState on Wait error
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 11:45:53 -08:00
f9590b0927
Adds missing exit to fatal function.
...
Extracts ProcessState when we get ExitError.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-25 13:54:45 -05:00
286fffa4ee
Merge pull request #405 from LK4D4/add_default_init
...
Add default InitArgs for factory
2015-02-25 09:20:35 -08:00
Victor Marmol
HuKeping
Mrunal Patel
Alexander Morozov
Andrey Vagin
Alexander Morozov
Mrunal Patel
Michael Crosby
Mabin
Qiang Huang
Daniel, Dao Quang Minh
Jessica Frazelle