summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatus Fabian <matfabia@cisco.com>2024-04-29 11:06:44 +0200
committerDave Wallace <dwallacelf@gmail.com>2024-04-29 15:44:41 +0000
commit18c9f1403720225bcb741c6822871c97f7d71872 (patch)
tree9b4ff6213b03f5b4f12267adf1df6a923d7234c3
parent52bd5376e42d48139561b6acbeb0683afccc9173 (diff)
hs-test: fix cpu allocator
Effective CPUs file is different between cgroups v1 and v2. Type: test Change-Id: Ic1b9059435b3f0944624120f57e72da45adca223 Signed-off-by: Matus Fabian <matfabia@cisco.com>
-rw-r--r--extras/hs-test/cpu.go25
1 files changed, 23 insertions, 2 deletions
diff --git a/extras/hs-test/cpu.go b/extras/hs-test/cpu.go
index 9a034ed2096..a976f47d8a5 100644
--- a/extras/hs-test/cpu.go
+++ b/extras/hs-test/cpu.go
@@ -2,11 +2,14 @@ package main
import (
"bufio"
+ "errors"
"fmt"
"os"
+ "os/exec"
+ "strings"
)
-var CPU_PATH = "/sys/fs/cgroup/cpuset.cpus.effective"
+var CgroupPath = "/sys/fs/cgroup/"
type CpuContext struct {
cpuAllocator *CpuAllocatorT
@@ -38,7 +41,25 @@ func (c *CpuAllocatorT) Allocate(nCpus int) (*CpuContext, error) {
func (c *CpuAllocatorT) readCpus() error {
var first, last int
- file, err := os.Open(CPU_PATH)
+
+ // Path depends on cgroup version. We need to check which version is in use.
+ // For that following command can be used: 'stat -fc %T /sys/fs/cgroup/'
+ // In case the output states 'cgroup2fs' then cgroups v2 is used, 'tmpfs' in case cgroups v1.
+ cmd := exec.Command("stat", "-fc", "%T", "/sys/fs/cgroup/")
+ byteOutput, err := cmd.CombinedOutput()
+ if err != nil {
+ return err
+ }
+ CpuPath := CgroupPath
+ if strings.Contains(string(byteOutput), "tmpfs") {
+ CpuPath += "cpuset/cpuset.effective_cpus"
+ } else if strings.Contains(string(byteOutput), "cgroup2fs") {
+ CpuPath += "cpuset.cpus.effective"
+ } else {
+ return errors.New("cgroup unknown fs: " + string(byteOutput))
+ }
+
+ file, err := os.Open(CpuPath)
if err != nil {
return err
}