Commit Graph

1911 Commits

Author SHA1 Message Date
Andrey Vagin da2535f2d1 mount: don't read /proc/self/cgroup many times
Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-09-10 21:00:22 +03:00
Andrey Vagin e49c1dc559 Rework ParseCgroupFile
Currently we parse /proc/self/cgroup for each controller.
It's ineffective.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
2015-09-10 20:59:27 +03:00
Alexander Morozov 24f4d5d1fd Remove old netlink library
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-09 19:38:02 -07:00
Alexander Morozov 916bd6bd68 Use github.com/vishvananda/netlink for networking
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-09 19:32:46 -07:00
Qiang Huang b94fe5b7f8 Fix bug in find cgroup mount point dir
Bug was introduced in #250

According to: http://man7.org/linux/man-pages/man5/proc.5.html

36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
(1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)
...
(7)  optional fields: zero or more fields of the form
       "tag[:value]".
The 7th field is optional. We should skip it when parsing mount info.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-09-10 08:29:12 +08:00
Mrunal Patel 5731a045fe Merge pull request #250 from hqhq/hq_cgroup_cleanup
Some cgroups cleanup
2015-09-09 11:48:02 -07:00
Qiang Huang f2ec7eff7e Rename FindCgroupMountpointAndSource
Rename it to FindCgroupMountpointAndRoot.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-09-09 09:29:11 +08:00
Qiang Huang bc67941c72 Parse directly in FindCgroupMountpointDir
Unify it with FindCgroupMountpoint, and add comments why
we should to do this.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-09-09 09:28:50 +08:00
Qiang Huang 8f35c181b2 Minor comments fix
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-09-07 10:39:22 +08:00
Rajasekaran 57cc442c13 Fixing checkpoint issue
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
2015-09-04 16:20:45 +05:30
Mrunal Patel 0f85e4e1a3 Merge pull request #239 from rajasec/restore-leaverunning
Restorefixforrunningcontainer
2015-09-02 11:21:30 -07:00
Alexander Morozov 05b1cda5dd Merge pull request #235 from hqhq/hq_fix_cgroup_test
Fix cgroup mount tests
2015-09-01 14:57:44 -07:00
Mrunal Patel 5c92e5d7e0 Merge pull request #232 from vishh/oom-score-adj
Adding oom_score_adj as a container config param
2015-08-31 14:45:29 -07:00
Vishnu Kannan cc232c4707 Adding oom_score_adj as a container config param.
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2015-08-31 14:02:59 -07:00
Rajasekaran 77af09efd6 Restorefixforrunningcontainer
Signed-off-by: Rajasekaran <rajasec79@gmail.com>
2015-08-31 22:16:38 +05:30
Mrunal Patel 8447547797 Merge pull request #233 from shishir-a412ed/comment_move
cleanup: outdated comment
2015-08-31 09:27:34 -07:00
Qiang Huang 085f465c00 Fix cgroup mount tests
I got:
```
exec_test.go:823: Mode expected to contain 'ro,nosuid,nodev,noexec': tmpfs on /sys/fs/cgroup type tmpfs (ro,seclabel,nosuid,nodev,noexec,relatime,mode=755
```wq

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-31 11:23:18 +08:00
Qiang Huang b7385e291c Always remount for bind mount
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-31 11:10:34 +08:00
Shishir Mahajan 0f3545e3d3 cleanup: outdated comment
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-08-29 11:50:39 -04:00
Michael Crosby b1e7041957 Merge pull request #165 from calavera/context_labels
Make label.Relabel safer.
2015-08-28 14:20:00 -07:00
Mrunal Patel 9c1e298b0e Merge pull request #179 from crosbymichael/debug-log
Add --log flag
2015-08-28 13:12:50 -07:00
Mrunal Patel 8b18c9af08 Merge pull request #229 from booyaa/doc_linux_only
Add caveat will only build on Linux as per #9
2015-08-28 11:29:07 -07:00
Mrunal Patel 525b3710d8 Merge pull request #231 from shishir-a412ed/socket_activation
Systemd integration with runc, for on-demand socket activation
2015-08-28 11:28:46 -07:00
Alexander Morozov 37c506058d Merge pull request #221 from crosbymichael/defaults-criu
Remove hard-coded default for tcp connections
2015-08-28 11:24:36 -07:00
Shishir Mahajan 6b9d64eefe Systemd integration with runc, for on-demand socket activation
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-08-28 14:24:01 -04:00
Alexander Morozov 98e6e70cf3 Merge pull request #214 from rajasec/restorefix
Restore container cleanup
2015-08-28 10:49:09 -07:00
Michael Crosby 5a3ebbdb1f Add --debug-log flag
Add a `--debug-log` flag for specifying a path to write the debug logs
to for runc.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-08-28 10:48:52 -07:00
Michael Crosby 5e75a12ec1 Merge pull request #224 from marcosnils/master
Update README config file devices
2015-08-28 10:46:09 -07:00
Michael Crosby b9c32b3869 Merge pull request #223 from rajasec/rlimitspec
Adding rlimit in spec
2015-08-28 10:34:59 -07:00
Mrunal Patel 1cb571f800 Merge pull request #228 from mheon/seccomp_config
Connect Seccomp configuration in Spec to backend
2015-08-28 10:32:42 -07:00
Mrunal Patel 7797873f1b Merge pull request #230 from shishir-a412ed/error_check_load_spec
Error should be checked after loadSpec
2015-08-27 08:18:47 -07:00
Shishir Mahajan 432dcede36 Error should be checked after loadSpec
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-08-27 11:03:43 -04:00
Mark Sta Ana a491b93ff3 Add caveat will only build on Linux as per #9
Signed-off-by: Mark Sta Ana <booyaabooyaabooyaa@gmail.com>
2015-08-27 08:50:46 +01:00
Matthew Heon 2ee6d1e8b6 Connect Seccomp configuration in Spec to configuration in Libcontainer
Signed-off-by: Matthew Heon <mheon@redhat.com>
2015-08-25 17:35:06 -04:00
Mrunal Patel 7291a52148 Merge pull request #210 from duglin/AddExecCmd
Add a 'start' command
2015-08-25 08:21:23 -07:00
Mrunal Patel 2f4c229a8c Merge pull request #215 from boucher/huikang-patch
Add hooks for passing explicit veth pairs for forwarding to CRIU
2015-08-24 21:23:29 -07:00
Rajasekaran fc97aa44e1 Updating README for rlimit
Signed-off-by: Rajasekaran <rajasec79@gmail.com>

Fixing indentation issue in README

Signed-off-by: Rajasekaran <rajasec79@gmail.com>
2015-08-25 06:02:59 +05:30
Hui Kang 7f23085c82 Add hooks for passing explicit veth pairs for forwarding to CRIU.
Signed-off-by: Hui Kang <hkang.sunysb@gmail.com>
2015-08-24 09:26:39 -07:00
Rajasekaran ab4b825f8c Adding rlimit in spec
Signed-off-by: Rajasekaran <rajasec79@gmail.com>

Removing return type

Signed-off-by: Rajasekaran <rajasec79@gmail.com>
2015-08-24 21:33:36 +05:30
Mrunal Patel ca2f4925c9 Merge pull request #219 from boucher/criu-logs
Add the criu log file path to the failure message.
2015-08-24 08:21:24 -07:00
Marcos Lilljedahl 241306b95c Update README config file devices
Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
2015-08-23 12:52:50 -03:00
Michael Crosby ba56afde7b Remove hard-coded default for tcp connections
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-08-21 15:59:43 -07:00
Doug Davis 714ae2acc9 Add a 'start' command
When any non-global-flag parameter appears on the command line make sure
there's a "command" even in the 'start' (run) case to ensure its not
ambiguous as to what the arg is. For example, w/o this fix its not
clear if
   runc foo
means 'foo' is the name of a config file or an unknown command.  Or worse,
you can't name a config file the same a ANY command, even future (yet to
be created) commands.

We should fix this now before we ship 1.0 and are forced to support this
ambiguous case for a long time.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-08-21 15:26:34 -07:00
boucher 8c812d0f50 Add the criu log file path to the failure message.
Signed-off-by: Ross Boucher <rboucher@gmail.com>
2015-08-21 14:20:59 -07:00
Mrunal Patel e7663a673e Merge pull request #70 from mheon/seccomp
Convert Seccomp support to use Libseccomp
2015-08-21 12:25:33 -07:00
Mrunal Patel 6d0f60bb94 Merge pull request #205 from tonistiigi/exec
Add exec command
2015-08-21 10:45:28 -07:00
Mrunal Patel 90e6d3763e Merge pull request #212 from laijs/cleanup
Simple Cleanups
2015-08-19 20:16:21 -07:00
Mrunal Patel e98d8e8ae2 Merge pull request #213 from laijs/error-message
richer information error message for terminal
2015-08-19 20:15:19 -07:00
Lai Jiangshan 29ced936a6 richer information error message for terminal
When we use ```cat | runc``` or ```runc /dev/stdin < config.json```,
it will fail and output ```FATA[0000] Container start failed: inappropriate ioctl for device```.
It is hard for the users to find out the reason from the message:
the config.json enables the terminal but the user redirect the stdin
to an non-terminal file.

After this patch, the output will be
```FATA[0000] Container start failed: Failed to set the terminal from the stdin: inappropriate ioctl for device```
So the user can disable the terminal in the config.json.

See the #202

Cc: W. Trevor King <wking@tremily.us> (@wking)
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-08-20 08:25:40 +08:00
Lai Jiangshan e48363d777 simplify a variable declaration
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2015-08-20 08:21:44 +08:00