Skip to content

L
lxc
Commit 95d5b147 by Serge Hallyn
Options

Revert "lxc-cmd-stop: two fixes"

This breaks code that depended on the monitor being fully dead before c->stop() returns. This reverts commit 62e04161.
parent d775f21b
Showing with 6 additions and 9 deletions
src/lxc/commands.c
...@@ -608,13 +608,11 @@ int lxc_cmd_stop(const char *name, const char *lxcpath) ...@@ -608,13 +608,11 @@ int lxc_cmd_stop(const char *name, const char *lxcpath)
return -1; return -1;
} }
if (!ret) { /* we do not expect any answer, because we wait for the connection to be
WARN("'%s' has stopped before replying with success", name); * closed
return -1; */
} if (ret > 0) {
ERROR("failed to stop '%s': %s", name, strerror(-cmd.rsp.ret));
if (cmd.rsp.ret != 0) {
ERROR("Container %s:%s had an error stopping", lxcpath, name);
return -1; return -1;
} }
...@@ -639,12 +637,11 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req, ...@@ -639,12 +637,11 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req,
* deadlock us * deadlock us
*/ */
if (cgroup_unfreeze(handler)) if (cgroup_unfreeze(handler))
goto out; return 0;
ERROR("Failed to unfreeze %s:%s", handler->lxcpath, handler->name); ERROR("Failed to unfreeze %s:%s", handler->lxcpath, handler->name);
rsp.ret = -1; rsp.ret = -1;
} }
out:
return lxc_cmd_rsp_send(fd, &rsp); return lxc_cmd_rsp_send(fd, &rsp);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment