The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3539
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === We can e.g. fail the unfreeze because the freezer cgroup is not available and then we erronously report that stopping the container failed. Closes: #3471. Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 586e8a8a57cdd0e665c9734fae685640751c063a Mon Sep 17 00:00:00 2001 From: Christian Brauner <christian.brau...@ubuntu.com> Date: Thu, 17 Sep 2020 11:11:44 +0200 Subject: [PATCH] commands: don't fail if unfreeze fails We can e.g. fail the unfreeze because the freezer cgroup is not available and then we erronously report that stopping the container failed. Closes: #3471. Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com> --- src/lxc/commands.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 4ed84c3a02..7245f7e2cb 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -895,11 +895,8 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req, TRACE("Sent signal %d to pidfd %d", stopsignal, handler->pid); rsp.ret = cgroup_ops->unfreeze(cgroup_ops, -1); - if (!rsp.ret) - return 0; - - ERROR("Failed to unfreeze container \"%s\"", handler->name); - rsp.ret = -errno; + if (rsp.ret) + WARN("Failed to unfreeze container \"%s\"", handler->name); } else { rsp.ret = -errno; }
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel