mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 15:19:49 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1729 from brauner/2017-08-03/ensure_cgroup_cleanup_before_restart

Browse Source 
start: ensure cgroups are cleaned up
This commit is contained in:
Serge Hallyn
2017-08-04 22:15:40 -05:00
committed by GitHub
parent 483efec8ca 4288b79f23
commit 332833712b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lxc/start.c
View File

@@ -720,8 +720,14 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
handler->netnsfd = -1; handler->netnsfd = -1;
} }
cgroup_destroy(handler);
lxc_set_state(name, handler, STOPPED); lxc_set_state(name, handler, STOPPED);
/* close command socket */
close(handler->conf->maincmd_fd);
handler->conf->maincmd_fd = -1;
if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL)) { if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL)) {
ERROR("Failed to run lxc.hook.post-stop for container \"%s\".", name); ERROR("Failed to run lxc.hook.post-stop for container \"%s\".", name);
if (handler->conf->reboot) { if (handler->conf->reboot) {
@@ -739,10 +745,6 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
lxc_console_delete(&handler->conf->console); lxc_console_delete(&handler->conf->console);
lxc_delete_tty(&handler->conf->tty_info); lxc_delete_tty(&handler->conf->tty_info);
/* close the command socket */
close(handler->conf->maincmd_fd);
handler->conf->maincmd_fd = -1;
/* The command socket is now closed, no more state clients can register /* The command socket is now closed, no more state clients can register
* themselves from now on. So free the list of state clients. * themselves from now on. So free the list of state clients.
*/ */
@@ -755,7 +757,6 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
free(cur); free(cur);
} }
free(handler->name);
if (handler->ttysock[0] != -1) { if (handler->ttysock[0] != -1) {
close(handler->ttysock[0]); close(handler->ttysock[0]);
close(handler->ttysock[1]); close(handler->ttysock[1]);
@@ -764,7 +765,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
if (handler->conf->ephemeral == 1 && handler->conf->reboot != 1) if (handler->conf->ephemeral == 1 && handler->conf->reboot != 1)
lxc_destroy_container_on_signal(handler, name); lxc_destroy_container_on_signal(handler, name);
cgroup_destroy(handler); free(handler->name);
free(handler); free(handler);
} }