clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-09-03 20:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from gao-feng/init-fail

Browse Source 
setup init_pid of pod until pod started successfully
This commit is contained in:
Lai Jiangshan
2016-09-19 15:32:27 +08:00
committed by GitHub
parent 5edb81f783 41366ae88a
commit 7294253548
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/init.c
+5 -4
View File
@@ -288,7 +288,7 @@ static int hyper_setup_pod_init(struct hyper_pod *pod)
uint32_t type;
void *stack;
int ret = -1;
int ret = -1, init_pid;
if (pipe2(arg.ctl_pipe, O_CLOEXEC) < 0) {
perror("create pipe between hyper init and pod init failed");
@@ -303,13 +303,13 @@ static int hyper_setup_pod_init(struct hyper_pod *pod)
arg.pod = pod;
pod->init_pid = clone(hyper_pod_init, stack + stacksize, flags, &arg);
init_pid = clone(hyper_pod_init, stack + stacksize, flags, &arg);
free(stack);
if (pod->init_pid < 0) {
if (init_pid < 0) {
perror("create container init process failed");
goto out;
}
fprintf(stdout, "pod init pid %d\n", pod->init_pid);
fprintf(stdout, "pod init pid %d\n", init_pid);
/* Wait for container start */
if (hyper_get_type(arg.ctl_pipe[0], &type) < 0) {
@@ -322,6 +322,7 @@ static int hyper_setup_pod_init(struct hyper_pod *pod)
goto out;
}
pod->init_pid = init_pid;
ret = 0;
out:
close(arg.ctl_pipe[1]);