Pablo Greco 40546a
From 5abd9049c8bdea6170dc455033e37811ba875db8 Mon Sep 17 00:00:00 2001
Pablo Greco 40546a
Message-Id: <5abd9049c8bdea6170dc455033e37811ba875db8@dist-git>
Pablo Greco 40546a
From: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
Date: Mon, 1 Jul 2019 17:06:13 +0200
Pablo Greco 40546a
Subject: [PATCH] vircgroup: fix bug in virCgroupEnableMissingControllers
Pablo Greco 40546a
MIME-Version: 1.0
Pablo Greco 40546a
Content-Type: text/plain; charset=UTF-8
Pablo Greco 40546a
Content-Transfer-Encoding: 8bit
Pablo Greco 40546a
Pablo Greco 40546a
If we are on host with systemd we need to build cgroup hierarchy
Pablo Greco 40546a
ourselves for controllers that are not managed by systemd.
Pablo Greco 40546a
Pablo Greco 40546a
As a starting parent we need to force root group because
Pablo Greco 40546a
virCgroupMakeGroup() takes that parent in order to inherit values
Pablo Greco 40546a
for cpuset controller.
Pablo Greco 40546a
Pablo Greco 40546a
By default cpuset controller is managed by systemd so we will never
Pablo Greco 40546a
hit the issue but for v2 cgroups we need to use parent cgroup every
Pablo Greco 40546a
time.
Pablo Greco 40546a
Pablo Greco 40546a
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Pablo Greco 40546a
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Pablo Greco 40546a
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
(cherry picked from commit 63b4ed0dd3e1555b4c9d82ef0ca0648493f75af2)
Pablo Greco 40546a
Pablo Greco 40546a
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297
Pablo Greco 40546a
Pablo Greco 40546a
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Pablo Greco 40546a
Message-Id: <ae150854a6a02300cd3329c538373b770320f504.1561993099.git.phrdina@redhat.com>
Pablo Greco 40546a
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Pablo Greco 40546a
---
Pablo Greco 40546a
 src/util/vircgroup.c | 2 +-
Pablo Greco 40546a
 1 file changed, 1 insertion(+), 1 deletion(-)
Pablo Greco 40546a
Pablo Greco 40546a
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
Pablo Greco 40546a
index 6aa30a82be..2328957818 100644
Pablo Greco 40546a
--- a/src/util/vircgroup.c
Pablo Greco 40546a
+++ b/src/util/vircgroup.c
Pablo Greco 40546a
@@ -1495,7 +1495,7 @@ virCgroupEnableMissingControllers(char *path,
Pablo Greco 40546a
     int ret = -1;
Pablo Greco 40546a
 
Pablo Greco 40546a
     if (virCgroupNew(pidleader,
Pablo Greco 40546a
-                     "",
Pablo Greco 40546a
+                     "/",
Pablo Greco 40546a
                      NULL,
Pablo Greco 40546a
                      controllers,
Pablo Greco 40546a
                      &parent) < 0)
Pablo Greco 40546a
-- 
Pablo Greco 40546a
2.22.0
Pablo Greco 40546a