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

!518 fix cpuset cgroup set error

Browse Source 
* fix cpuset cgroup error
This commit is contained in:
jake 2024-02-08 01:15:17 +00:00 committed by haozi007
parent 71d14e23a6
commit d26b0c24a2
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0014-fix-cpuset-cgroup-error.patch Normal file
View File

@ -0,0 +1,60 @@
From 63945e7f907d7c2943505fffeca606a1c96121fb Mon Sep 17 00:00:00 2001
From: jikai <jikai11@huawei.com>
Date: Wed, 7 Feb 2024 17:36:44 +0800
Subject: [PATCH] fix cpuset cgroup error
Signed-off-by: jikai <jikai11@huawei.com>
---
src/lxc/cgroups/cgfsng.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 984e969..471c281 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1007,18 +1007,6 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
*/
cpuset_v1 = !is_unified_hierarchy(h) && string_in_list(h->controllers, "cpuset");
-#ifdef HAVE_ISULAD
- /* ensure that cpuset cgroup was set in the whole cgroup path, though lxc does
- * cpuset1_initialize(set cgroup.clone_children to 1 and cpuset.cpus and cpuset.mems)
- * but it only does so for the first layer of the cgroup path.
- * Since K8S could create the path already, so we need to ensure the cpuset cgroup was set
- */
- if (cpuset_v1 && !isulad_cg_legacy_handle_cpuset_hierarchy(h, ops->container_cgroup)) {
- ERROR("Failed to handle legacy cpuset controller");
- return false;
- }
-#endif
-
if (payload && cgroup_leaf) {
/* With isolation both parts need to not already exist. */
fd_limit = __cgroup_tree_create(h->dfd_base, cgroup_limit_dir, 0755, cpuset_v1, false);
@@ -1886,6 +1874,11 @@ __cgfsng_ops static bool cgfsng_payload_enter(struct cgroup_ops *ops,
#ifdef HAVE_ISULAD
retry:
+ /* ensure that cpuset cgroup was set in the whole cgroup path, though lxc does
+ * cpuset1_initialize(set cgroup.clone_children to 1 and cpuset.cpus and cpuset.mems)
+ * but it only does so for the first layer of the cgroup path.
+ * Since K8S could create the path already, so we need to ensure the cpuset cgroup was set
+ */
ret = lxc_writeat(h->dfd_con, "cgroup.procs", pidstr, len);
if (ret != 0) {
if (retry_count < max_retry) {
@@ -3509,6 +3502,11 @@ static int cg_legacy_set_data(struct cgroup_ops *ops, const char *filename,
#ifdef HAVE_ISULAD
fullpath = must_make_path(h->path_con, filename, NULL);
retry:
+ /* ensure that cpuset cgroup was set in the whole cgroup path, though lxc does
+ * cpuset1_initialize(set cgroup.clone_children to 1 and cpuset.cpus and cpuset.mems)
+ * but it only does so for the first layer of the cgroup path.
+ * Since K8S could create the path already, so we need to ensure the cpuset cgroup was set
+ */
nret = lxc_write_to_file(fullpath, value, strlen(value), false, 0666);
if (nret != 0) {
if (retry_count < max_retry) {
--
2.33.0

9
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 10
%global _release 11
%global enable_isulad 1
Name: lxc
@ -22,6 +22,7 @@ Patch0010: 0010-add-storage-block-code-for-embedded-image.patch
Patch0011: 0011-skip-setup-console-if-disable-pty-and-fix-syscontain.patch
Patch0012: 0012-fix-dev-mount-failed-and-skip-send-recv-devpts_fd-if.patch
Patch0013: 0013-ensure-cpuset-cgroup-built-while-writing-cgroup.proc.patch
Patch0014: 0014-fix-cpuset-cgroup-error.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp)
@ -209,6 +210,12 @@ meson test -C build
%endif
%changelog
* Wed Feb 07 2024 jikai<jikai11@huawei.com> - 5.0.2-11
- Type: bugfix
- ID:NA
- SUG:NA
- DESC: fix cpuset cgroup set error
* Mon Feb 05 2024 jikai<jikai11@huawei.com> - 5.0.2-10
- Type: bugfix
- ID:NA