proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 11:13:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2641 from brauner/2018-09-23/cgroup_scoping_fixes

Browse Source 
cgfsng: copy parent's cpu settings for monitor too
This commit is contained in:
Stéphane Graber 2018-09-23 19:30:21 +02:00 committed by GitHub
commit 854d13e22e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/cgroups/cgfsng.c
View File

@ -586,8 +586,7 @@ static bool cg_legacy_handle_cpuset_hierarchy(struct hierarchy *h, char *cgname)
} }
} }
clonechildrenpath = clonechildrenpath = must_make_path(cgpath, "cgroup.clone_children", NULL);
must_make_path(cgpath, "cgroup.clone_children", NULL);
/* unified hierarchy doesn't have clone_children */ /* unified hierarchy doesn't have clone_children */
if (!file_exists(clonechildrenpath)) { if (!file_exists(clonechildrenpath)) {
free(clonechildrenpath); free(clonechildrenpath);
@ -1201,6 +1200,11 @@ static bool monitor_create_path_for_hierarchy(struct hierarchy *h, char *cgname)
if (dir_exists(h->monitor_full_path)) if (dir_exists(h->monitor_full_path))
return true; return true;
if (!cg_legacy_handle_cpuset_hierarchy(h, cgname)) {
ERROR("Failed to handle legacy cpuset controller");
return false;
}
ret = mkdir_p(h->monitor_full_path, 0755); ret = mkdir_p(h->monitor_full_path, 0755);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to create cgroup \"%s\"", h->monitor_full_path); ERROR("Failed to create cgroup \"%s\"", h->monitor_full_path);