Commit Graph

378 Commits

Author SHA1 Message Date
Pengfei Ni 2ccac3fa9c Merge pull request #151 from gao-feng/conntrack
portmapping: blow up nf_conntrack_max
2016-08-30 09:48:43 +08:00
Gao feng 52c87dc016 portmapping: blow up nf_conntrack_max
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-08-30 09:45:49 +08:00
Lai Jiangshan f359cb9468 Merge pull request #150 from laijs/v0.6.2
bump version to 0.6.2
v0.6.2
2016-08-29 17:27:01 +08:00
Lai Jiangshan 3de74e927c bump version to 0.6.2
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-29 17:18:06 +08:00
Lai Jiangshan 7b54d5c9da Merge pull request #149 from gao-feng/limit
setup Limit by default
2016-08-29 16:55:35 +08:00
Gao feng 1e4711d898 setup file-max by default
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-08-29 16:06:14 +08:00
Gao feng cb71f43ed1 blow up rlimit of process
NOFILE: 1000000:1000000
NPROC: 30604:30604
SIGPENGING: 30604:30604

Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-08-29 16:05:15 +08:00
Gao feng c72276b004 Merge pull request #146 from bergwolf/mkdir-for-file-volume-only
do not create _data dir without checking first
2016-08-14 14:49:17 +08:00
Peng Tao 5735f9f674 free scandir list in non file volumes case
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-08-14 13:54:06 +08:00
Peng Tao de0c2c97e4 do not create _data dir without checking first
container_populate_volume() checks _data existance to determine if it
should populate old data. We only need to create new _data with 0777
mode if there is no existing one. That includes two cases:
1. before populating old data in container_populate_volume()
2. mount an empty volume for the fist time

For file volume case, we need to chmod it instead, to make sure any user
is able to read/write the file.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-08-14 11:00:45 +08:00
Lai Jiangshan 8a86dd1f51 Merge pull request #144 from bergwolf/file-vol
fix up file volume binding handling
2016-08-10 22:41:48 +08:00
Peng Tao 5ba9b2550d handle directory destination for a file volume binding
If the destination directoroy does not exist in the base image,
create it as a file instead, following docker's practice.

[hyperpublic@hyperhq]$docker run -t -i -v /home/bergwolf/bin/procmuttmail:/vol/data/ busybox
/ # ls -l /vol/data
-rwxr-xr-x    1 1000     1000            28 Apr 17 05:38 /vol/data
/ #

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-08-10 18:03:52 +08:00
Peng Tao da986b4a3a create file volume's parent directory when necessary
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-08-10 18:02:05 +08:00
Gao feng 2f4626dde2 Merge pull request #142 from laijs/enter-sandbox
enter the sandbox when hyper_setup_container_rootfs()
2016-08-02 22:30:03 +08:00
Lai Jiangshan bf61d6306e enter the sandbox when hyper_setup_container_rootfs()
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-02 11:15:45 +08:00
Lai Jiangshan 74f6930073 add hyper_enter_sandbox()
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-02 11:15:45 +08:00
Lai Jiangshan 0c05c999e3 remove tty from struct hyper_win_size
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-02 11:15:45 +08:00
Lai Jiangshan 97099eb46e declare functions to static
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-02 11:15:45 +08:00
Lai Jiangshan b28a02fa0d Merge pull request #140 from gao-feng/event2
[RFC]  handle ttyfd out event priorly when write buffer is full
2016-08-01 09:39:50 +08:00
Gao feng 9a6738d84d handle ttyfd out event priorly when write buffer is full
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-29 15:57:45 +08:00
Lai Jiangshan d3cfa23dde Merge pull request #139 from gao-feng/revert
Revert "move mount /proc to hyper_container_final_init()"
2016-07-21 10:07:15 +08:00
Gao feng 9bfb3be414 Revert "move mount /proc to hyper_container_final_init()"
running in child process, fail to setup finalinit

This reverts commit b0a601793e.
2016-07-21 10:02:58 +08:00
Gao feng ae2d491c20 Merge pull request #138 from laijs/mount-proc
Mount proc when first exec
2016-07-20 17:15:57 +08:00
Lai Jiangshan b0a601793e move mount /proc to hyper_container_final_init()
exec can be run earlier than start container.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-20 16:58:44 +08:00
Lai Jiangshan 19f1dc012e refactor struct hyper_container
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-20 15:28:55 +08:00
Lai Jiangshan 87b1a5c29a add missing pod->remains++
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-20 12:24:48 +08:00
Lai Jiangshan 4a63bceb67 Merge pull request #137 from bergwolf/volume_mode
create volume _data dir with 0777 mode
2016-07-19 09:13:15 +08:00
Peng Tao b2f6b89ea6 move hyper_create_file to util.h
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-07-18 20:55:52 +08:00
Peng Tao db4f364510 create volume _data dir with 0777 mode
So that any user is able to write to the new volume.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-07-18 20:55:32 +08:00
Gao feng 2ccea842bd Merge pull request #136 from bergwolf/hyper_cp
hyper_copy_dir should use hyper_cmd
2016-07-18 13:24:44 +08:00
Peng Tao 3197bcad45 hyper_copy_dir should use hyper_cmd
Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-07-16 16:01:24 +08:00
Lai Jiangshan 3bed96c176 Merge pull request #133 from gao-feng/env
env: setup envs of container for exec
2016-07-15 16:40:43 +08:00
Gao feng eecb4c5612 env: setup envs of container for exec
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-15 15:07:27 +08:00
Gao feng c015887bb6 Merge pull request #132 from gao-feng/bug
cleanup & fix zombie process bug
2016-07-14 22:55:38 +08:00
Gao feng 2169309145 exec: restore sigmask of child process
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-14 19:37:21 +08:00
Gao feng c5d25b6f5f event: rename de to he
dvm_event has been removed long long ago.

Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-14 19:26:37 +08:00
Gao feng da6b36411a remove useless var global_exec
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-14 19:22:09 +08:00
Lai Jiangshan 06d10f2844 Merge pull request #130 from gao-feng/proc
mount proc filesystem of container in enter_container
2016-07-07 21:08:46 +08:00
Gao feng 70d35640b9 mount proc filesystem of container in enter_container
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
2016-07-07 18:50:47 +08:00
Gao feng 1f501c5417 Merge pull request #129 from bergwolf/shutdown_on_error
send ERROR to runv when shutting down upon errors
2016-07-07 09:14:46 +08:00
Gao feng 1c21bb2e6f Merge pull request #128 from laijs/open-ns
wait until mount namespace fd is opened
2016-07-07 09:14:07 +08:00
Lai Jiangshan b6c6e1f991 wait until mount namespace fd is opened
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 19:28:55 +08:00
Peng Tao 98059369b8 send ERROR to runv when shutting down upon errors
Otherwise ACK might let runv think its command succeeds.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-07-06 19:19:06 +08:00
Gao feng 03187117e1 Merge pull request #127 from laijs/container-and-exec-operations
split container operation to hyper_setup_container() and hyper_run_process()
2016-07-06 19:04:23 +08:00
Lai Jiangshan 54aed5efc5 split container operation to hyper_setup_container() and hyper_run_process()
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 17:15:42 +08:00
Lai Jiangshan 98b8211ddc move hyper_start_containers() to hyper_start_pod()
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 15:55:07 +08:00
Lai Jiangshan cd9a8f4306 set early env for exec
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 14:05:46 +08:00
Lai Jiangshan bb550c2444 do not apply the container's env on exec
let the hyperd do it. (merge the envs)

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 14:05:33 +08:00
Lai Jiangshan 00308d00b5 split hyper_exec_cmd()
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-07-06 11:39:27 +08:00
Gao feng e255de660d Merge pull request #126 from laijs/exec-fork
Exec:  use fork() instead of the fragile clone(CLONE_VM|CLONE_FILES)
2016-07-05 12:58:25 +08:00