Commit Graph

407 Commits

Author SHA1 Message Date
Peng Tao 34ec350357 Revert "handle volume special fstype" 2016-09-14 17:35:48 +08:00
Gao feng b58b03874d Merge pull request #163 from laijs/c-string
enable using api command data as c-string inplace
2016-09-14 05:25:14 -04:00
Gao feng 02b777058d Merge pull request #164 from laijs/file-command
use file_command for reader_file&write_file command
2016-09-14 05:10:25 -04:00
Lai Jiangshan 17f9f7b4cf use file_command for write_file command
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-14 11:33:01 +08:00
Lai Jiangshan 4fa99f7a5b rename hyper_reader to file_command
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-14 11:27:20 +08:00
Gao feng 6efb8d2638 Merge pull request #162 from laijs/consume-all-the-data-in-handle
Consume all the data in handle()
2016-09-14 10:51:06 +08:00
Lai Jiangshan e2b79425f1 enable using api command data as c-string inplace
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-14 10:40:03 +08:00
Lai Jiangshan 21cb97d970 always comsume the date after handle()
even handle() failed.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-14 10:17:06 +08:00
Lai Jiangshan f06259b0b9 direct set the buf->get to zero after consume
the handle() had consumed all the read data,
and we don't need to move the leftover data.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-14 10:12:41 +08:00
Lai Jiangshan 70dd9f1447 Merge pull request #161 from laijs/api-header
move constants of API to src/api.h
2016-09-14 10:02:01 +08:00
Lai Jiangshan 8b674e78f5 move constants of API to src/api.h
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-13 23:47:00 +08:00
Lai Jiangshan de59d91bc2 Merge pull request #159 from dlespiau/20160912-trivial
A few trivial changes
2016-09-13 07:49:11 +08:00
Damien Lespiau 6824ff3d2e util: Fix 'calss' type in the virtio-ports scanning code
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 18:23:03 +01:00
Damien Lespiau ffd28a721c container: Fix error message in hyper_rescan_scsi()
The message needs to mention scanning scsi, not virtio-ports.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 18:23:03 +01:00
Damien Lespiau 6f73ec97e3 init: Fix copy/paste typo in mount error string
The error message should mention devtmpfs and not sysfs in that case.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 18:23:03 +01:00
Damien Lespiau f01a9f4081 all: Fix the directroy typo
That typo crept in a few places.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 18:23:03 +01:00
Damien Lespiau 79d066d847 gitignore: Ignore tags files
Running "make tags" generates tags to jump around the code easily.
Let's ignore the generated files though.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 18:23:03 +01:00
Lai Jiangshan 9089ec3f25 Merge pull request #158 from dlespiau/20160912-autogen-hyperstart
build: Change hyperinit strings in autogen.sh to say hyperstart
2016-09-12 20:37:14 +08:00
Damien Lespiau 6e8bc85878 build: Change hyperinit strings in autogen.sh to say hyperstart
I'm guessing that's a previous name for the project.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2016-09-12 13:36:54 +01:00
Gao feng 4c0887f131 Merge pull request #153 from bergwolf/volmode
set umask when setting up container rootfs
2016-09-09 12:45:51 +08:00
Peng Tao 3d942a45bb set umask when setting up container rootfs
So that we can truly create files and directories in any mode.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-09-09 10:32:54 +08:00
Lai Jiangshan 83223f6832 Merge pull request #154 from bergwolf/mntinit
handle volume special fstype
2016-09-02 22:45:57 +08:00
Gao feng a2202183fb Merge pull request #155 from laijs/fix-order-bug
ensure the mnt_ns opened before the process exit
2016-09-02 15:08:30 +08:00
Lai Jiangshan 37856283d5 ensure the mnt_ns opened before the process exit
quote of the log:
> open container mount ns failed: No such file or directory
> start containers failed

the process exits when hyper_enter_sandbox(), so we have
to move the wait before hyper_enter_sandbox().

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-09-02 14:50:47 +08:00
Peng Tao bb7ebdaadd handle volume special fstype
We can use INIT_VOLUME_MOUNTPOINT_FSTYPE to tell hyperstart that
current volume is a fake volume that only needs mountpoint to be present.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
2016-09-02 14:26:15 +08:00
Gao feng fe5c9a9d9c Merge pull request #152 from laijs/api-version
add version API
2016-09-01 14:37:59 +08:00
Lai Jiangshan 62ef95ba93 add version API
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-08-31 13:37:00 +08:00
Lai Jiangshan d8fb6c1af3 Merge pull request #143 from YaoZengzeng/parson-winsize
hyper_set_win_size with parson
2016-08-31 09:29:25 +08:00
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
YaoZengzeng 5b21370efd hyper_set_win_size with parson
Signed-off-by: Yao Zengzeng <yaozengzeng@zju.edu.cn>
2016-08-10 14:01:24 +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