[lxc-devel] [lxd/master] daemon: log cgroup layout on startup

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191212/7ddbd02b/attachment.bin>
-------------- next part --------------
From 380c5b3adeda63c7b115a3c7a83b4d68335ead94 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Thu, 12 Dec 2019 11:28:20 +0100
Subject: [PATCH] daemon: log cgroup layout on startup

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 lxd/cgroup/init.go | 15 +++++++++++++++
 lxd/daemon.go      |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/lxd/cgroup/init.go b/lxd/cgroup/init.go
index ac78c19db9..d0bbd9d06a 100644
--- a/lxd/cgroup/init.go
+++ b/lxd/cgroup/init.go
@@ -48,6 +48,21 @@ func GetInfo() Info {
 	return info
 }
 
+func (info *Info) Mode() string {
+	switch info.Layout {
+	case CgroupsDisabled:
+		return "disabled"
+	case CgroupsUnified:
+		return "cgroup2"
+	case CgroupsHybrid:
+		return "hybrid"
+	case CgroupsLegacy:
+		return "legacy"
+	}
+
+	return "unknown"
+}
+
 func init() {
 	_, err := os.Stat("/proc/self/ns/cgroup")
 	if err == nil {
diff --git a/lxd/daemon.go b/lxd/daemon.go
index d38a8e24bd..13ae45493a 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -28,6 +28,7 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery/identchecker"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
+	"github.com/lxc/lxd/lxd/cgroup"
 	"github.com/lxc/lxd/lxd/cluster"
 	"github.com/lxc/lxd/lxd/daemon"
 	"github.com/lxc/lxd/lxd/db"
@@ -622,6 +623,9 @@ func (d *Daemon) init() error {
 		logger.Infof(" - unprivileged file capabilities: no")
 	}
 
+	cgroups := cgroup.GetInfo()
+	logger.Infof(" - cgroup layout: %s", cgroups.Mode())
+
 	// Detect shiftfs support.
 	if shared.IsTrue(os.Getenv("LXD_SHIFTFS_DISABLE")) {
 		logger.Infof(" - shiftfs support: disabled")