Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark CGroups as off when missing essential controllers #19176

Merged
merged 8 commits into from
Dec 15, 2023
Merged

Mark CGroups as off when missing essential controllers #19176

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9872aca
Log a more descriptive error message when failing to enable CGroup co…
DavidVentura Nov 26, 2023
7777677
Update client/lib/cgroupslib/init.go
DavidVentura Dec 2, 2023
9b81dc2
Add a changelog entry
DavidVentura Dec 4, 2023
b34b16f
Mark CGroups as off when missing essential controllers
DavidVentura Dec 14, 2023
0bcf645
Update description
DavidVentura Dec 14, 2023
4a31a17
Remove logs from init
DavidVentura Dec 14, 2023
ba657c5
Run gofmt
DavidVentura Dec 14, 2023
7e97f30
address comments from code review
tgross Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 41 additions & 13 deletions client/lib/cgroupslib/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
package cgroupslib

import (
"fmt"
"strings"
"slices"
"bytes"
"os"
"path/filepath"
Expand Down Expand Up @@ -134,18 +137,37 @@ func Init(log hclog.Logger, cores string) {

case CG2:
// the cgroup controllers we need to activate at the root and on the nomad slice
const activation = "+cpuset +cpu +io +memory +pids"
controllers := []string{"cpuset", "cpu", "io", "memory", "pids"}

// the name of the cgroup subtree interface file
const subtreeFile = "cgroup.subtree_control"

// the name of the cgroup controllers interface file
const controllersFile = "cgroup.controllers"

//
// configuring root cgroup (/sys/fs/cgroup)
//

if err := writeCG(activation, subtreeFile); err != nil {
log.Error("failed to create nomad cgroup", "error", err)
return
controllersRootPath := filepath.Join(root, controllersFile)
content, err := os.ReadFile(controllersRootPath)
if err != nil {
log.Info("failed to read cgroups controller file", "path", controllersRootPath, "error", err)
DavidVentura marked this conversation as resolved.
Show resolved Hide resolved
} else {
rootSubtreeControllers := strings.Split(strings.TrimSpace(string(content)), " ")

for _, controller := range controllers {
if !slices.Contains(rootSubtreeControllers, controller) {
log.Error("controller not enabled in your system, check kernel build configuration and commandline (/proc/cmdline)", "controller", controller)
}
}
}

for _, controller := range controllers {
if err := writeCG(fmt.Sprintf("+%s", controller), subtreeFile); err != nil {
log.Error("failed to enable cgroup controller", "error", err, "controller", controller)
return
}
}

//
Expand All @@ -157,9 +179,11 @@ func Init(log hclog.Logger, cores string) {
return
}

if err := writeCG(activation, NomadCgroupParent, subtreeFile); err != nil {
log.Error("failed to set subtree control on nomad cgroup", "error", err)
return
for _, controller := range controllers {
if err := writeCG(fmt.Sprintf("+%s", controller), NomadCgroupParent, subtreeFile); err != nil {
log.Error("failed to enable controller on nomad cgroup", "error", err, "controller", controller)
return
}
}

if err := writeCG(cores, NomadCgroupParent, cpusetFile); err != nil {
Expand All @@ -178,9 +202,11 @@ func Init(log hclog.Logger, cores string) {
return
}

if err := writeCG(activation, NomadCgroupParent, SharePartition(), subtreeFile); err != nil {
log.Error("failed to set subtree control on cpuset share partition", "error", err)
return
for _, controller := range controllers {
if err := writeCG(fmt.Sprintf("+%s", controller), NomadCgroupParent, SharePartition(), subtreeFile); err != nil {
log.Error("failed to set subtree control on share partition", "error", err)
return
}
}

log.Debug("partition member nomad.slice/share cgroup initialized")
Expand All @@ -194,9 +220,11 @@ func Init(log hclog.Logger, cores string) {
return
}

if err := writeCG(activation, NomadCgroupParent, ReservePartition(), subtreeFile); err != nil {
log.Error("failed to set subtree control on cpuset reserve partition", "error", err)
return
for _, controller := range controllers {
if err := writeCG(fmt.Sprintf("+%s", controller), NomadCgroupParent, ReservePartition(), subtreeFile); err != nil {
log.Error("failed to set subtree control on reserve partition", "error", err)
return
}
}

log.Debug("partition member nomad.slice/reserve cgroup initialized")
Expand Down