Merge pull request #3539 from brauner/2020-09-17/fixes

commands: don't fail if unfreeze fails

Merge pull request #3539 from brauner/2020-09-17/fixes
b324a255 · Stéphane Graber · GitHub · 4226b2e5 · 8db8adea · b324a255
Unverified Commit b324a255 authored Sep 17, 2020 by Stéphane Graber Committed by GitHub Sep 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

commands.c src/lxc/commands.c +4 -5

No files found.
--- 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;
 	}