Skip to content

Commit

Permalink
commands: fix race when open()/close() cmd socket
Browse files Browse the repository at this point in the history
When we report STOPPED to a caller and then close the command socket it is
technically possible - and I've seen this happen on the test builders - that a
container start() right after a wait() will receive ECONNREFUSED because it
called open() before we close(). So for all new state clients simply close the
command socket. This will inform all state clients that the container is
STOPPED and also prevents a race between a open()/close() on the command socket
causing a new process to get ECONNREFUSED because we haven't yet closed the
command socket.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Dec 15, 2017
1 parent f14bc24 commit 32ee3fc
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/lxc/start.c
Expand Up @@ -758,11 +758,23 @@ void lxc_fini(const char *name, struct lxc_handler *handler)

cgroup_destroy(handler);

lxc_set_state(name, handler, STOPPED);

/* close command socket */
close(handler->conf->maincmd_fd);
handler->conf->maincmd_fd = -1;
/* This function will try to connect to the legacy lxc-monitord state
* server and only exists for backwards compatibility.
*/
lxc_monitor_send_state(name, STOPPED, handler->lxcpath);

if (handler->conf->reboot == 0) {
/* For all new state clients simply close the command socket.
* This will inform all state clients that the container is
* STOPPED and also prevents a race between a open()/close() on
* the command socket causing a new process to get ECONNREFUSED
* because we haven't yet closed the command socket.
*/
close(handler->conf->maincmd_fd);
handler->conf->maincmd_fd = -1;
} else {
lxc_set_state(name, handler, STOPPED);
}

if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL)) {
ERROR("Failed to run lxc.hook.post-stop for container \"%s\".", name);
Expand Down

0 comments on commit 32ee3fc

Please sign in to comment.