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

!355 [sync] PR-353: skip kill cgroup processes if no hierarchies

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-10-11 08:16:15 +00:00 committed by Gitee
commit 830feea4fd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0049-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

19
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 2022092001
%global _release 2022101101
Name: lxc
Version: 4.0.3
@ -54,8 +54,9 @@ Patch0043: 0043-do-not-operate-playload-and-attach-cgroup-if-no-cont.patch
Patch0044: 0044-fix-HOME-env-unset-error.patch
Patch0045: 0045-only-set-user-or-image-set-non-empty-HOME.patch
Patch0046: 0046-return-fail-if-no-args-or-no-rootfs-path-found.patch
Patch0047: 0047-fix-tools-with-option-give-error-message.patch
Patch0048: 0048-fix-do-mask-paths-after-parent-mounted.patch
Patch0047: 0047-fix-tools-with-option-give-error-message.patch
Patch0048: 0048-fix-do-mask-paths-after-parent-mounted.patch
Patch0049: 0049-skip-kill-cgroup-processes-if-no-hierarchies.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp)
@ -227,23 +228,29 @@ make check
%{_mandir}/*/man7/%{name}*
%changelog
* Tue Oct 11 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022101101
- 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
- SUG:NA
- DESC: do mask paths after parent mounted
- DESC: do mask paths after parent mounted
* Fri Sep 02 2022 Neil.wrz<wangrunze13@huawei.com> - 4.0.3-2022090201
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix tools using -? option give error
- DESC: fix tools using -? option give error
* Wed Aug 31 2022 zhangxiaoyu<zhangxiaoyu58@huawei.com> - 4.0.3-2022083101
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: return fail if no args or no rootfs path found
- DESC: return fail if no args or no rootfs path founds
* Fri Aug 12 2022 haozi007<liuhao27@huawei.com> - 4.0.3-2022081201
- Type:bugfix

1
series.conf
View File

@ -46,3 +46,4 @@
0046-return-fail-if-no-args-or-no-rootfs-path-found.patch
0047-fix-tools-with-option-give-error-message.patch
0048-fix-do-mask-paths-after-parent-mounted.patch
0049-skip-kill-cgroup-processes-if-no-hierarchies.patch