From 81bf1dade08ee40a9ecc32f5d384fdf35e3edbf3 Mon Sep 17 00:00:00 2001

Message-Id: <81bf1dade08ee40a9ecc32f5d384fdf35e3edbf3@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:06:24 +0200

Subject: [PATCH] vircgroup: detect available backend for cgroup

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

We need to update one test-case because now new cgroup object will be

created only if there is any cgroup backend available.

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

(cherry picked from commit f60af21594801088fff217aebf33b58825bd8a80)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

Message-Id: <2815d54d5cffdef81bf9a41136b2d6a7e1d75b55.1561993100.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/util/vircgroup.c     | 18 ++++++++++++++++++

 src/util/vircgrouppriv.h |  3 +++

 tests/vircgrouptest.c    | 38 +++-----------------------------------

 3 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c

index 47a3b9ed58..15d0cb65ac 100644

--- a/src/util/vircgroup.c

+++ b/src/util/vircgroup.c

@@ -711,10 +711,28 @@ virCgroupDetect(virCgroupPtr group,

                 virCgroupPtr parent)

 {

     int rc;

+    size_t i;

+    virCgroupBackendPtr *backends = virCgroupBackendGetAll();

     VIR_DEBUG("group=%p controllers=%d path=%s parent=%p",

               group, controllers, path, parent);

+    if (!backends)

+        return -1;

+

+    for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) {

+        if (backends[i] && backends[i]->available()) {

+            group->backend = backends[i];

+            break;

+        }

+    }

+

+    if (!group->backend) {

+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

+                       _("no cgroup backend available"));

+        return -1;

+    }

+

     if (parent) {

         if (virCgroupCopyMounts(group, parent) < 0)

             return -1;

diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h

index 046c96c52c..2caa966fee 100644

--- a/src/util/vircgrouppriv.h

+++ b/src/util/vircgrouppriv.h

@@ -30,6 +30,7 @@

 # define __VIR_CGROUP_PRIV_H__

 # include "vircgroup.h"

+# include "vircgroupbackend.h"

 struct _virCgroupController {

     int type;

@@ -47,6 +48,8 @@ typedef virCgroupController *virCgroupControllerPtr;

 struct _virCgroup {

     char *path;

+    virCgroupBackendPtr backend;

+

     virCgroupController controllers[VIR_CGROUP_CONTROLLER_LAST];

 };

diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c

index 5031a2973d..588a6e824d 100644

--- a/tests/vircgrouptest.c

+++ b/tests/vircgrouptest.c

@@ -114,16 +114,6 @@ const char *mountsAllInOne[VIR_CGROUP_CONTROLLER_LAST] = {

     [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup",

     [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,

 };

-const char *mountsLogind[VIR_CGROUP_CONTROLLER_LAST] = {

-    [VIR_CGROUP_CONTROLLER_CPU] = NULL,

-    [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,

-    [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,

-    [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,

-    [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,

-    [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,

-    [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,

-    [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/not/really/sys/fs/cgroup/systemd",

-};

 const char *links[VIR_CGROUP_CONTROLLER_LAST] = {

     [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup/cpu",

@@ -147,17 +137,6 @@ const char *linksAllInOne[VIR_CGROUP_CONTROLLER_LAST] = {

     [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,

 };

-const char *linksLogind[VIR_CGROUP_CONTROLLER_LAST] = {

-    [VIR_CGROUP_CONTROLLER_CPU] = NULL,

-    [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,

-    [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,

-    [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,

-    [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,

-    [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,

-    [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,

-    [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL,

-};

-

 struct _detectMountsData {

     const char *file;

@@ -555,24 +534,13 @@ static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED)

 {

     virCgroupPtr cgroup = NULL;

     int ret = -1;

-    const char *placement[VIR_CGROUP_CONTROLLER_LAST] = {

-        [VIR_CGROUP_CONTROLLER_CPU] = NULL,

-        [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL,

-        [VIR_CGROUP_CONTROLLER_CPUSET] = NULL,

-        [VIR_CGROUP_CONTROLLER_MEMORY] = NULL,

-        [VIR_CGROUP_CONTROLLER_DEVICES] = NULL,

-        [VIR_CGROUP_CONTROLLER_FREEZER] = NULL,

-        [VIR_CGROUP_CONTROLLER_BLKIO] = NULL,

-        [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/",

-    };

-    if (virCgroupNewSelf(&cgroup) < 0) {

-        fprintf(stderr, "Cannot create cgroup for self\n");

+    if (virCgroupNewSelf(&cgroup) == 0) {

+        fprintf(stderr, "Expected cgroup creation to fail.\n");

         goto cleanup;

     }

-    ret = validateCgroup(cgroup, "", mountsLogind, linksLogind, placement);

-

+    ret = 0;

  cleanup:

     virCgroupFree(&cgroup);

     return ret;

-- 

2.22.0