clearlinux/hyperstart
2
0
Fork 0
mirror of https://github.com/clearlinux/hyperstart.git synced 2026-08-26 09:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

return fail if start container failed

Browse Source 
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
This commit is contained in:
Gao feng
2015-10-10 13:50:52 +08:00
parent 16cf97584c
commit 8553460afe
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/container.c
+4 -1
View File
@@ -491,8 +491,10 @@ int hyper_start_container(struct hyper_container *container,
close(arg.pipe[0]);
close(arg.pipe[1]);
if (hyper_watch_exec_pty(&container->exec, pod) < 0)
if (hyper_watch_exec_pty(&container->exec, pod) < 0) {
fprintf(stderr, "faile to watch container pty\n");
goto fail;
}
fprintf(stdout, "container %s init pid is %d\n", container->id, pid);
return 0;
@@ -503,6 +505,7 @@ fail:
container->ns = -1;
fprintf(stdout, "container %s init exit code %d\n", container->id, -1);
container->exec.code = -1;
container->exec.seq = 0;
return -1;
}
src/init.c
+7 -2
View File
@@ -39,6 +39,7 @@ struct hyper_ctl ctl;
static struct hyper_event_ops hyper_signal_ops;
static int hyper_handle_exit(struct hyper_pod *pod);
static int hyper_stop_pod(struct hyper_pod *pod);
static int hyper_set_win_size(char *json, int length)
{
@@ -453,7 +454,10 @@ static int hyper_do_start_containers(void *data)
for (i = 0; i < pod->c_num; i++) {
c = &pod->c[i];
list_add_tail(&c->exec.list, &pod->exec_head);
hyper_start_container(c, utsns, ipcns, pod);
if (hyper_start_container(c, utsns, ipcns, pod) < 0) {
fprintf(stderr, "fail to start container\n");
goto out;
}
}
ret = 0;
@@ -555,6 +559,7 @@ static int hyper_setup_container(struct hyper_pod *pod)
goto out;
}
ctl.ctl.fd = arg.ctl_pipe[0];
arg.pod = pod;
pod->init_pid = clone(hyper_pod_init, stack + stacksize, flags, &arg);
@@ -586,7 +591,6 @@ static int hyper_setup_container(struct hyper_pod *pod)
goto out;
}
ctl.ctl.fd = arg.ctl_pipe[0];
fprintf(stdout, "hyper_init_event hyper ctl pipe fd %d\n", ctl.ctl.fd);
if (hyper_init_event(&ctl.ctl, &hyper_ctl_pipe_ops, pod) < 0 ||
hyper_add_event(ctl.efd, &ctl.ctl, EPOLLIN) < 0) {
@@ -598,6 +602,7 @@ out:
close(arg.ctl_pipe[1]);
if (ret < 0) {
close(arg.ctl_pipe[0]);
hyper_stop_pod(pod);
}
return ret;
}