github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cri: spec_linux: drop unused retvals

Browse Source 
cgroupv1HasHugetlb() and cgroupv2HasHugetlb() may return errors, but nobody
(there's just one call site anyways) ever cares. So drop the unnecessary code.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2023-08-16 14:10:20 +02:00
parent 3b32d3c6f2
commit 0c1ad52eac
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/cri/opts/spec_linux.go
View File

@ -78,9 +78,9 @@ func isHugetlbControllerPresent() bool {
supportsHugetlbOnce.Do(func() { supportsHugetlbOnce.Do(func() {
supportsHugetlb = false supportsHugetlb = false
if IsCgroup2UnifiedMode() { if IsCgroup2UnifiedMode() {
supportsHugetlb, _ = cgroupv2HasHugetlb() supportsHugetlb = cgroupv2HasHugetlb()
} else { } else {
supportsHugetlb, _ = cgroupv1HasHugetlb() supportsHugetlb = cgroupv1HasHugetlb()
} }
}) })
return supportsHugetlb return supportsHugetlb
@ -89,41 +89,36 @@ func isHugetlbControllerPresent() bool {
var ( var (
_cgroupv1HasHugetlbOnce sync.Once _cgroupv1HasHugetlbOnce sync.Once
_cgroupv1HasHugetlb bool _cgroupv1HasHugetlb bool
_cgroupv1HasHugetlbErr error
_cgroupv2HasHugetlbOnce sync.Once _cgroupv2HasHugetlbOnce sync.Once
_cgroupv2HasHugetlb bool _cgroupv2HasHugetlb bool
_cgroupv2HasHugetlbErr error
isUnifiedOnce sync.Once isUnifiedOnce sync.Once
isUnified bool isUnified bool
) )
// cgroupv1HasHugetlb returns whether the hugetlb controller is present on // cgroupv1HasHugetlb returns whether the hugetlb controller is present on
// cgroup v1. // cgroup v1.
func cgroupv1HasHugetlb() (bool, error) { func cgroupv1HasHugetlb() bool {
_cgroupv1HasHugetlbOnce.Do(func() { _cgroupv1HasHugetlbOnce.Do(func() {
if _, err := os.ReadDir("/sys/fs/cgroup/hugetlb"); err != nil { if _, err := os.ReadDir("/sys/fs/cgroup/hugetlb"); err != nil {
_cgroupv1HasHugetlbErr = fmt.Errorf("readdir /sys/fs/cgroup/hugetlb: %w", err)
_cgroupv1HasHugetlb = false _cgroupv1HasHugetlb = false
} else { } else {
_cgroupv1HasHugetlbErr = nil
_cgroupv1HasHugetlb = true _cgroupv1HasHugetlb = true
} }
}) })
return _cgroupv1HasHugetlb, _cgroupv1HasHugetlbErr return _cgroupv1HasHugetlb
} }
// cgroupv2HasHugetlb returns whether the hugetlb controller is present on // cgroupv2HasHugetlb returns whether the hugetlb controller is present on
// cgroup v2. // cgroup v2.
func cgroupv2HasHugetlb() (bool, error) { func cgroupv2HasHugetlb() bool {
_cgroupv2HasHugetlbOnce.Do(func() { _cgroupv2HasHugetlbOnce.Do(func() {
controllers, err := os.ReadFile("/sys/fs/cgroup/cgroup.controllers") controllers, err := os.ReadFile("/sys/fs/cgroup/cgroup.controllers")
if err != nil { if err != nil {
_cgroupv2HasHugetlbErr = fmt.Errorf("read /sys/fs/cgroup/cgroup.controllers: %w", err)
return return
} }
_cgroupv2HasHugetlb = strings.Contains(string(controllers), "hugetlb") _cgroupv2HasHugetlb = strings.Contains(string(controllers), "hugetlb")
}) })
return _cgroupv2HasHugetlb, _cgroupv2HasHugetlbErr return _cgroupv2HasHugetlb
} }
// IsCgroup2UnifiedMode returns whether we are running in cgroup v2 unified mode. // IsCgroup2UnifiedMode returns whether we are running in cgroup v2 unified mode.