From 8db8adea44b0be8736a42cafbc8b4fb048e2a655 Mon Sep 17 00:00:00 2001 From: Christian Brauner 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 --- src/lxc/commands.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 4ed84c3a0..de09c3aff 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -894,12 +894,11 @@ static int lxc_cmd_stop_callback(int fd, struct lxc_cmd_req *req, else TRACE("Sent signal %d to pidfd %d", stopsignal, handler->pid); - rsp.ret = cgroup_ops->unfreeze(cgroup_ops, -1); - if (!rsp.ret) - return 0; + ret = cgroup_ops->unfreeze(cgroup_ops, -1); + if (ret) + WARN("Failed to unfreeze container \"%s\"", handler->name); - ERROR("Failed to unfreeze container \"%s\"", handler->name); - rsp.ret = -errno; + return 0; } else { rsp.ret = -errno; } -- 2.47.2