packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip kill cgroup processes if no hierarchies

Browse Source 
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
This commit is contained in:
zhangxiaoyu 2022-09-22 10:49:33 +08:00
parent cbc3fc6f69
commit 77cb713873
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0016-skip-kill-cgroup-processes-if-no-hierarchies.patch Normal file
View File

@ -0,0 +1,36 @@
From 2aa9204b74c96413944a715408cfd5d2f3a34d66 Mon Sep 17 00:00:00 2001
From: isuladci <isulad@ci.com>
Date: Thu, 22 Sep 2022 10:44:26 +0800
Subject: [PATCH] skip kill cgroup processes if no hierarchies
Signed-off-by: isuladci <isulad@ci.com>
---
src/lxc/cgroups/isulad_cgfsng.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c
index 8a9656a..f5cf81c 100644
--- a/src/lxc/cgroups/isulad_cgfsng.c
+++ b/src/lxc/cgroups/isulad_cgfsng.c
@@ -677,15 +677,14 @@ __cgfsng_ops static bool isulad_cgfsng_payload_destroy(struct cgroup_ops *ops,
return false;
}
-#ifdef HAVE_ISULAD
if (ops->no_controller) {
- DEBUG("no controller found, isgnore isulad_cgfsng_payload_destroy");
+ DEBUG("no controller found, ignore isulad_cgfsng_payload_destroy");
return true;
}
-#endif
if (!ops->hierarchies) {
- return false;
+ DEBUG("no hierarchies found, ignore isulad_cgfsng_payload_destroy");
+ return true;
}
if (!handler) {
--
2.25.1

13
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 2022092001
%global _release 2022092201
Name: lxc
Version: 4.0.3
@ -21,8 +21,9 @@ Patch0010: 0010-check-yajl-only-when-have-isulad.patch
Patch0011: 0011-drop-security_context_t.patch
Patch0012: 0012-only-set-user-or-image-set-non-empty-HOME.patch
Patch0013: 0013-return-fail-if-no-args-or-no-rootfs-path-found.patch
Patch0014: 0014-fix-tools-using-option-give-error-message.patch
Patch0015: 0015-fix-do-mask-pathes-after-parent-mounted.patch
Patch0014: 0014-fix-tools-using-option-give-error-message.patch
Patch0015: 0015-fix-do-mask-pathes-after-parent-mounted.patch
Patch0016: 0016-skip-kill-cgroup-processes-if-no-hierarchies.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp)
@ -194,6 +195,12 @@ make check
%{_mandir}/*/man7/%{name}*
%changelog
* The Sep 22 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022092201
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: skip kill cgroup processes if no hierarchies
* Tue Sep 20 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022092001
- Type:bugfix
- ID:NA