proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 17:12:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

finalize handler in lxcapi_restore

Browse Source 
We can also narrow the scope of this, since we only need it in the process that
is actually going to use it.

Reported-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Tycho Andersen 2014-09-02 18:37:05 -05:00 committed by Stéphane Graber
parent 6d5b330dc0
commit 3b72c4a0ee
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/lxc/lxccontainer.c
View File

@ -3816,12 +3816,6 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
if (!tmpnam(pidfile)) if (!tmpnam(pidfile))
return false; return false;
struct lxc_handler *handler;
handler = lxc_init(c->name, c->lxc_conf, c->config_path);
if (!handler)
return false;
pid = fork(); pid = fork();
if (pid < 0) if (pid < 0)
return false; return false;
@ -3863,6 +3857,9 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
exit(1); exit(1);
} else { } else {
int status; int status;
struct lxc_handler *handler;
bool error = false;
pid_t w = waitpid(pid, &status, 0); pid_t w = waitpid(pid, &status, 0);
if (w == -1) { if (w == -1) {
@ -3870,29 +3867,37 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
return false; return false;
} }
handler = lxc_init(c->name, c->lxc_conf, c->config_path);
if (!handler)
return false;
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
if (WEXITSTATUS(status)) { if (WEXITSTATUS(status)) {
return false; error = true;
goto out_fini_handler;
} }
else { else {
int netnr = 0, ret; int netnr = 0, ret;
bool error = false;
FILE *f = fopen(pidfile, "r"); FILE *f = fopen(pidfile, "r");
if (!f) { if (!f) {
error = true;
perror("reading pidfile"); perror("reading pidfile");
ERROR("couldn't read restore's init pidfile %s\n", pidfile); ERROR("couldn't read restore's init pidfile %s\n", pidfile);
return false; goto out_fini_handler;
} }
ret = fscanf(f, "%d", (int*) &handler->pid); ret = fscanf(f, "%d", (int*) &handler->pid);
fclose(f); fclose(f);
if (ret != 1) { if (ret != 1) {
error = true;
ERROR("reading restore pid failed"); ERROR("reading restore pid failed");
return false; goto out_fini_handler;
} }
if (container_mem_lock(c)) if (container_mem_lock(c)) {
return false; error = true;
goto out_fini_handler;
}
lxc_list_for_each(it, &c->lxc_conf->network) { lxc_list_for_each(it, &c->lxc_conf->network) {
char eth[128], veth[128]; char eth[128], veth[128];
@ -3916,10 +3921,12 @@ static bool lxcapi_restore(struct lxc_container *c, char *directory, bool verbos
out_unlock: out_unlock:
container_mem_unlock(c); container_mem_unlock(c);
if (error) if (error)
return false; goto out_fini_handler;
if (lxc_set_state(c->name, handler, RUNNING)) if (lxc_set_state(c->name, handler, RUNNING)) {
return false; error = true;
goto out_fini_handler;
}
} }
} }
@ -3927,9 +3934,11 @@ out_unlock:
lxc_abort(c->name, handler); lxc_abort(c->name, handler);
return false; return false;
} }
}
return true; out_fini_handler:
lxc_fini(c->name, handler);
return !error;
}
} }
static int lxcapi_attach_run_waitl(struct lxc_container *c, lxc_attach_options_t *options, const char *program, const char *arg, ...) static int lxcapi_attach_run_waitl(struct lxc_container *c, lxc_attach_options_t *options, const char *program, const char *arg, ...)

2
src/lxc/start.c
View File

@ -460,7 +460,7 @@ out_free:
return NULL; return NULL;
} }
static void lxc_fini(const char *name, struct lxc_handler *handler) void lxc_fini(const char *name, struct lxc_handler *handler)
{ {
/* The STOPPING state is there for future cleanup code /* The STOPPING state is there for future cleanup code
* which can take awhile * which can take awhile

1
src/lxc/start.h
View File

@ -79,6 +79,7 @@ extern int lxc_poll(const char *name, struct lxc_handler *handler);
extern int lxc_set_state(const char *name, struct lxc_handler *handler, lxc_state_t state); extern int lxc_set_state(const char *name, struct lxc_handler *handler, lxc_state_t state);
extern void lxc_abort(const char *name, struct lxc_handler *handler); extern void lxc_abort(const char *name, struct lxc_handler *handler);
extern struct lxc_handler *lxc_init(const char *name, struct lxc_conf *, const char *); extern struct lxc_handler *lxc_init(const char *name, struct lxc_conf *, const char *);
extern void lxc_fini(const char *name, struct lxc_handler *handler);
extern int lxc_check_inherited(struct lxc_conf *conf, int fd_to_ignore); extern int lxc_check_inherited(struct lxc_conf *conf, int fd_to_ignore);
int __lxc_start(const char *, struct lxc_conf *, struct lxc_operations *, int __lxc_start(const char *, struct lxc_conf *, struct lxc_operations *,