Use config "cpu_total_compute" (if set) for all CPU statistics (#17628)

Before this commit, it was only used for fingerprinting, but not
for CPU stats on nodes or tasks. This meant that if the
auto-detection failed, setting the cpu_total_compute didn't resolved
the issue.

This issue was most noticeable on ARM64, as there auto-detection
always failed.
This commit is contained in:
Patric Stout
2023-07-19 20:30:47 +02:00
committed by GitHub
parent 0d343f269a
commit e190eae395
21 changed files with 238 additions and 205 deletions

View File

@@ -147,7 +147,7 @@ func TestExecutor_Isolation_PID_and_IPC_hostMode(t *testing.T) {
execCmd.ModePID = "host" // disable PID namespace
execCmd.ModeIPC = "host" // disable IPC namespace
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
ps, err := executor.Launch(execCmd)
@@ -190,7 +190,7 @@ func TestExecutor_IsolationAndConstraints(t *testing.T) {
execCmd.ModePID = "private"
execCmd.ModeIPC = "private"
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
ps, err := executor.Launch(execCmd)
@@ -282,7 +282,7 @@ func TestExecutor_CgroupPaths(t *testing.T) {
execCmd.ResourceLimits = true
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
ps, err := executor.Launch(execCmd)
@@ -344,7 +344,7 @@ func TestExecutor_CgroupPathsAreDestroyed(t *testing.T) {
execCmd.ResourceLimits = true
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
ps, err := executor.Launch(execCmd)
@@ -547,7 +547,7 @@ func TestExecutor_EscapeContainer(t *testing.T) {
execCmd.ResourceLimits = true
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
_, err := executor.Launch(execCmd)
@@ -597,7 +597,7 @@ func TestExecutor_DoesNotInheritOomScoreAdj(t *testing.T) {
execCmd.Cmd = "/bin/bash"
execCmd.Args = []string{"-c", "cat /proc/self/oom_score_adj"}
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
_, err = executor.Launch(execCmd)
@@ -691,7 +691,7 @@ CapAmb: 0000000000000400`,
execCmd.Capabilities = capsAllowed
}
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
_, err := executor.Launch(execCmd)
@@ -739,7 +739,7 @@ func TestExecutor_ClientCleanup(t *testing.T) {
execCmd, allocDir := testExecCmd.command, testExecCmd.allocDir
defer allocDir.Destroy()
executor := NewExecutorWithIsolation(testlog.HCLogger(t))
executor := NewExecutorWithIsolation(testlog.HCLogger(t), 0)
defer executor.Shutdown("", 0)
// Need to run a command which will produce continuous output but not
@@ -864,7 +864,7 @@ func TestUniversalExecutor_NoCgroup(t *testing.T) {
execCmd.BasicProcessCgroup = false
execCmd.ResourceLimits = false
executor := NewExecutor(testlog.HCLogger(t))
executor := NewExecutor(testlog.HCLogger(t), 0)
defer executor.Shutdown("SIGKILL", 0)
_, err = executor.Launch(execCmd)