aboutsummaryrefslogtreecommitdiffstats
path: root/extras/hs-test/cpu.go
diff options
context:
space:
mode:
Diffstat (limited to 'extras/hs-test/cpu.go')
-rw-r--r--extras/hs-test/cpu.go57
1 files changed, 42 insertions, 15 deletions
diff --git a/extras/hs-test/cpu.go b/extras/hs-test/cpu.go
index e17bc11fbe0..69b4cabd4e3 100644
--- a/extras/hs-test/cpu.go
+++ b/extras/hs-test/cpu.go
@@ -2,43 +2,70 @@ package main
import (
"bufio"
+ "errors"
"fmt"
+ . "github.com/onsi/ginkgo/v2"
"os"
+ "os/exec"
+ "strings"
)
-var CPU_PATH = "/sys/fs/cgroup/cpuset.cpus.effective"
+var CgroupPath = "/sys/fs/cgroup/"
type CpuContext struct {
cpuAllocator *CpuAllocatorT
cpus []int
}
-func (c *CpuContext) Release() {
- c.cpuAllocator.cpus = append(c.cpuAllocator.cpus, c.cpus...)
- c.cpus = c.cpus[:0] // empty the list
-}
-
type CpuAllocatorT struct {
cpus []int
}
var cpuAllocator *CpuAllocatorT = nil
-func (c *CpuAllocatorT) Allocate(nCpus int) (*CpuContext, error) {
+func (c *CpuAllocatorT) Allocate(vppContainerCount int, nCpus int) (*CpuContext, error) {
var cpuCtx CpuContext
-
- if len(c.cpus) < nCpus {
- return nil, fmt.Errorf("could not allocate %d CPUs; available: %d", nCpus, len(c.cpus))
+ maxCpu := GinkgoParallelProcess() * 2 * nCpus
+ minCpu := (GinkgoParallelProcess() - 1) * 2 * nCpus
+ if len(c.cpus) < maxCpu {
+ vppContainerCount += 1
+ err := fmt.Errorf("could not allocate %d CPUs; available: %d; attempted to allocate cores %d-%d",
+ nCpus*vppContainerCount, len(c.cpus), minCpu, minCpu+nCpus*vppContainerCount)
+ return nil, err
}
- cpuCtx.cpus = c.cpus[0:nCpus]
+ if vppContainerCount == 0 {
+ cpuCtx.cpus = c.cpus[minCpu : maxCpu-nCpus]
+ } else if vppContainerCount == 1 {
+ cpuCtx.cpus = c.cpus[minCpu+nCpus : maxCpu]
+ } else {
+ return nil, fmt.Errorf("too many VPP containers; CPU allocation for >2 VPP containers is not implemented yet")
+ }
+
cpuCtx.cpuAllocator = c
- c.cpus = c.cpus[nCpus:]
return &cpuCtx, nil
}
-func (c *CpuAllocatorT) readCpus(fname string) 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
}
@@ -60,7 +87,7 @@ func (c *CpuAllocatorT) readCpus(fname string) error {
func CpuAllocator() (*CpuAllocatorT, error) {
if cpuAllocator == nil {
cpuAllocator = new(CpuAllocatorT)
- err := cpuAllocator.readCpus(CPU_PATH)
+ err := cpuAllocator.readCpus()
if err != nil {
return nil, err
}