clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-04 04:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

change socketpair to pipe

Browse Source 
If one pair of pipe created by socketpair closed, the other side
will receice error, so other side cannot know the exec result of
peer.

Use pipe to replace socketpair.

Signed-off-by: Gao feng <omarapazanadi@gmail.com>
This commit is contained in:
Gao feng
2015-09-24 14:38:46 +08:00
parent 5c3bd1b19f
commit d45be919cd
4 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+3 -3
View File
@@ -396,7 +396,7 @@ static int hyper_container_init(void *data)
fail:
container->exec.code = -1;
hyper_send_type_block(arg->pipe[1], ERROR, 0);
hyper_send_type(arg->pipe[1], ERROR);
_exit(-1);
}
@@ -452,7 +452,7 @@ int hyper_start_container(struct hyper_container *container,
goto fail;
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, arg.pipe) < 0) {
if (pipe2(arg.pipe, O_CLOEXEC) < 0) {
perror("create pipe between pod init execcmd failed");
goto fail;
}
@@ -478,7 +478,7 @@ int hyper_start_container(struct hyper_container *container,
}
/* wait for ready message */
if (hyper_get_type_block(arg.pipe[0], &type) < 0 || type != READY) {
if (hyper_get_type(arg.pipe[0], &type) < 0 || type != READY) {
fprintf(stderr, "wait for container started failed\n");
goto fail;
}
src/exec.c
+28 -26
View File
@@ -165,12 +165,8 @@ int hyper_dup_exec_tty(int to, struct hyper_exec *e)
goto out;
}
if (hyper_send_type_block(to, READY, 0) < 0) {
fprintf(stderr, "%s send ready message failed\n", __func__);
goto out;
}
fflush(stdout);
hyper_send_type(to, READY);
if (dup2(fd, STDIN_FILENO) < 0) {
perror("dup tty device to stdin failed");
@@ -285,6 +281,7 @@ static int hyper_do_exec_cmd(void *data)
struct hyper_exec *exec = arg->exec;
struct hyper_pod *pod = arg->pod;
int pipe[2] = {-1, -1}, pid;
int ret = -1;
if (exec->id) {
char path[512];
@@ -294,33 +291,33 @@ static int hyper_do_exec_cmd(void *data)
pidns = open(path, O_RDONLY| O_CLOEXEC);
if (pidns < 0) {
perror("fail to open pidns of pod init");
_exit(-1);
goto out;
}
/* enter pidns of pod init, so the children of this process will run in
* pidns of pod init, see man 2 setns */
if (setns(pidns, CLONE_NEWPID) < 0) {
perror("enter pidns of pod init failed");
_exit(-1);
goto out;
}
close(pidns);
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, pipe) < 0) {
if (pipe2(pipe, O_CLOEXEC) < 0) {
perror("create pipe in exec command failed");
_exit(-1);
goto out;
}
pid = fork();
if (pid < 0) {
perror("fail to fork");
_exit(-1);
goto out;
} else if (pid > 0) {
uint32_t type;
if (hyper_get_type_block(pipe[0], &type) < 0 || type != READY) {
if (hyper_get_type(pipe[0], &type) < 0 || type != READY) {
fprintf(stderr, "hyper init doesn't get execcmd ready message\n");
hyper_send_type_block(arg->pipe[1], ERROR, 0);
hyper_send_type(arg->pipe[1], ERROR);
goto out;
}
@@ -335,32 +332,35 @@ static int hyper_do_exec_cmd(void *data)
goto out;
}
if (hyper_send_type_block(arg->pipe[1], READY, 0) < 0) {
fprintf(stderr, "%s send ready message failed\n", __func__);
goto out;
}
out:
close(pipe[0]);
close(pipe[1]);
_exit(0);
ret = 0;
goto out;
}
if (exec->id && hyper_enter_container(pod, exec) < 0) {
fprintf(stderr, "enter container ns failed\n");
_exit(-1);
goto exit;
}
if (hyper_dup_exec_tty(pipe[1], exec) < 0) {
fprintf(stderr, "dup pts to exec stdio failed\n");
_exit(-1);
goto exit;
}
if (execvp(exec->argv[0], exec->argv) < 0) {
perror("exec failed");
_exit(-1);
goto exit;
}
_exit(0);
ret = 0;
exit:
hyper_send_type(pipe[1], ERROR);
_exit(ret);
out:
hyper_send_type(arg->pipe[1], ret ? ERROR : READY);
close(pipe[0]);
close(pipe[1]);
_exit(ret);
}
int hyper_exec_cmd(char *json, int length)
@@ -401,7 +401,7 @@ int hyper_exec_cmd(char *json, int length)
goto out;
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, arg.pipe) < 0) {
if (pipe2(arg.pipe, O_CLOEXEC) < 0) {
perror("create pipe between pod init execcmd failed");
goto out;
}
@@ -414,7 +414,7 @@ int hyper_exec_cmd(char *json, int length)
goto out;
}
if (hyper_get_type_block(arg.pipe[0], &type) < 0 || type != READY) {
if (hyper_get_type(arg.pipe[0], &type) < 0 || type != READY) {
fprintf(stderr, "hyper init doesn't get execcmd ready message\n");
return -1;
}
@@ -436,6 +436,8 @@ int hyper_release_exec(struct hyper_exec *exec,
if (!exec->exit && exec->seq) {
fprintf(stdout, "first user of exec exit\n");
exec->exit = 1;
close(exec->ptyfd);
exec->ptyfd = -1;
return 0;
}
src/init.c
+22 -21
View File
@@ -431,13 +431,13 @@ static int hyper_do_start_containers(void *data)
hyper_start_container(c, utsns, ipcns, pod);
}
if (hyper_send_type(arg->ctl_pipe[1], READY) < 0) {
ret = 0;
out:
if (hyper_send_type(arg->ctl_pipe[1], ret ? ERROR : READY) < 0) {
fprintf(stderr, "container init send ready message failed\n");
goto out;
}
ret = 0;
out:
close(pidns);
close(utsns);
close(ipcns);
@@ -463,7 +463,7 @@ int hyper_start_containers(struct hyper_pod *pod)
goto out;
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, arg.ctl_pipe) < 0) {
if (pipe2(arg.ctl_pipe, O_CLOEXEC) < 0) {
perror("create pipe between hyper init and pod init failed");
goto out;
}
@@ -476,7 +476,7 @@ int hyper_start_containers(struct hyper_pod *pod)
}
/* Wait for container start */
if (hyper_get_type_block(arg.ctl_pipe[0], &type) < 0) {
if (hyper_get_type(arg.ctl_pipe[0], &type) < 0) {
perror("get enter_container_pidns ready message failed");
goto out;
}
@@ -728,7 +728,7 @@ static int hyper_cmd_write_file(char *json, int length)
int pipe[2] = {-1, -1};
int pid, mntns = -1, fd;
char path[512];
int len = 0, size;
int len = 0, size, ret = -1;
fprintf(stdout, "%s\n", __func__);
memset(&writter, 0, sizeof(writter));
@@ -743,7 +743,7 @@ static int hyper_cmd_write_file(char *json, int length)
goto out;
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, pipe) < 0) {
if (pipe2(pipe, O_CLOEXEC) < 0) {
perror("create writter pipe failed");
goto out;
}
@@ -761,17 +761,18 @@ static int hyper_cmd_write_file(char *json, int length)
} else if (pid > 0) {
uint32_t type;
if (hyper_get_type_block(pipe[0], &type) < 0 || type != READY) {
if (hyper_get_type(pipe[0], &type) < 0 || type != READY) {
fprintf(stderr, "get incorrect message type %d, expect READY\n", type);
goto out;
}
ret = 0;
goto out;
}
if (setns(mntns, CLONE_NEWNS) < 0) {
perror("fail to enter container ns");
_exit(-1);
goto exit;
}
sprintf(path, "/tmp/hyper/%s/root/%s/", c->id, c->rootfs);
@@ -780,13 +781,13 @@ static int hyper_cmd_write_file(char *json, int length)
/* TODO: wait for container finishing setup root */
if (chroot(path) < 0) {
perror("chroot for exec command failed");
_exit(-1);
goto exit;
}
fd = open(writter.file, O_CREAT| O_WRONLY, 0644);
if (fd < 0) {
perror("fail to open target file");
_exit(-1);
goto exit;
}
while(len < writter.len) {
@@ -797,13 +798,14 @@ static int hyper_cmd_write_file(char *json, int length)
continue;
perror("fail to write data to file");
_exit(-1);
goto exit;
}
len += size;
}
hyper_send_type(pipe[1], READY);
ret = 0;
exit:
hyper_send_type(pipe[1], ret ? ERROR : READY);
_exit(0);
out:
close(pipe[0]);
@@ -827,7 +829,7 @@ struct hyper_file_arg {
static int hyper_do_cmd_read_file(void *data)
{
struct stat st;
int len = 0, size, fd;
int len = 0, size, fd, ret = -1;
struct hyper_file_arg *arg = data;
if (setns(arg->mntns, CLONE_NEWNS) < 0) {
@@ -877,11 +879,10 @@ static int hyper_do_cmd_read_file(void *data)
}
fprintf(stdout, "read data %s\n", *arg->data);
hyper_send_type(arg->pipe[1], READY);
return 0;
ret = 0;
err:
hyper_send_type(arg->pipe[1], ERROR);
return -1;
hyper_send_type(arg->pipe[1], ret ? ERROR : READY);
return ret;
}
static int hyper_cmd_read_file(char *json, int length, uint32_t *datalen, uint8_t **data)
@@ -915,7 +916,7 @@ static int hyper_cmd_read_file(char *json, int length, uint32_t *datalen, uint8_
goto out;
}
if (hyper_socketpair(PF_UNIX, SOCK_STREAM, 0, arg.pipe) < 0) {
if (pipe2(arg.pipe, O_CLOEXEC) < 0) {
perror("create reader pipe failed");
goto out;
}
@@ -938,7 +939,7 @@ static int hyper_cmd_read_file(char *json, int length, uint32_t *datalen, uint8_
goto out;
}
if (hyper_get_type_block(arg.pipe[0], &type) < 0 || type != READY) {
if (hyper_get_type(arg.pipe[0], &type) < 0 || type != READY) {
fprintf(stderr, "%s to incorrect type %" PRIu32 "\n", __func__, type);
goto out;
}
src/net.h
+1
View File
@@ -50,6 +50,7 @@ int hyper_setup_network(struct hyper_pod *pod);
void hyper_cleanup_network(struct hyper_pod *pod);
int hyper_setup_dns(struct hyper_pod *pod);
void hyper_cleanup_dns(struct hyper_pod *pod);
int hyper_get_type(int fd, uint32_t *type);
int hyper_get_type_block(int fd, uint32_t *type);
int hyper_send_type(int fd, uint32_t type);
int hyper_send_type_block(int fd, uint32_t type, int need_ack);