kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-07 02:45:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

numa: enable numa topology detection (#18146)

Browse Source 
* client: refactor cgroups management in client

* client: fingerprint numa topology

* client: plumb numa and cgroups changes to drivers

* client: cleanup task resource accounting

* client: numa client and config plumbing

* lib: add a stack implementation

* tools: remove ec2info tool

* plugins: fixup testing for cgroups / numa changes

* build: update makefile and package tests and cl
This commit is contained in:
Seth Hoenig
2023-08-10 17:05:30 -05:00
committed by GitHub
parent 5bc49e5208
commit a4cc76bd3e
149 changed files with 3677 additions and 5395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/shared/executor/executor_test.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/nomad/ci"
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/lib/cgutil"
"github.com/hashicorp/nomad/client/lib/cgroupslib"
"github.com/hashicorp/nomad/client/taskenv"
"github.com/hashicorp/nomad/client/testutil"
"github.com/hashicorp/nomad/helper/testlog"
@@ -29,6 +29,7 @@ import (
"github.com/hashicorp/nomad/plugins/drivers"
tu "github.com/hashicorp/nomad/testutil"
ps "github.com/mitchellh/go-ps"
"github.com/shoenig/test/must"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -36,7 +37,7 @@ import (
var executorFactories = map[string]executorFactory{}
type executorFactory struct {
new func(hclog.Logger, uint64) Executor
new func(hclog.Logger) Executor
configureExecCmd func(*testing.T, *ExecCommand)
}
@@ -90,13 +91,20 @@ func testExecutorCommand(t *testing.T) *testExecCmd {
LinuxResources: &drivers.LinuxResources{
CPUShares: 500,
MemoryLimitBytes: 256 * 1024 * 1024,
CpusetCgroupPath: cgroupslib.LinuxResourcesPath(alloc.ID, task.Name),
},
},
}
if cgutil.UseV2 {
cmd.Resources.LinuxResources.CpusetCgroupPath = filepath.Join(cgutil.CgroupRoot, "testing.scope", cgutil.CgroupScope(alloc.ID, task.Name))
}
// create cgroup for our task (because we aren't using task runners)
f := cgroupslib.Factory(alloc.ID, task.Name)
must.NoError(t, f.Setup())
// cleanup cgroup once test is done (because no task runners)
t.Cleanup(func() {
_ = f.Kill()
_ = f.Teardown()
})
testCmd := &testExecCmd{
command: cmd,
@@ -150,7 +158,7 @@ func TestExecutor_Start_Invalid(t *testing.T) {
execCmd.Args = []string{"1"}
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
_, err := executor.Launch(execCmd)
@@ -170,7 +178,7 @@ func TestExecutor_Start_Wait_Failure_Code(t *testing.T) {
execCmd.Args = []string{"-c", "sleep 1; /bin/date fail"}
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
ps, err := executor.Launch(execCmd)
@@ -195,7 +203,7 @@ func TestExecutor_Start_Wait(t *testing.T) {
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
ps, err := executor.Launch(execCmd)
@@ -232,7 +240,7 @@ func TestExecutor_Start_Wait_Children(t *testing.T) {
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("SIGKILL", 0)
ps, err := executor.Launch(execCmd)
@@ -273,7 +281,7 @@ func TestExecutor_WaitExitSignal(t *testing.T) {
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
pState, err := executor.Launch(execCmd)
@@ -331,7 +339,7 @@ func TestExecutor_Start_Kill(t *testing.T) {
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
ps, err := executor.Launch(execCmd)
@@ -536,7 +544,7 @@ func TestExecutor_Start_Kill_Immediately_NoGrace(t *testing.T) {
execCmd.Args = []string{"100"}
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
ps, err := executor.Launch(execCmd)
@@ -572,7 +580,7 @@ func TestExecutor_Start_Kill_Immediately_WithGrace(t *testing.T) {
execCmd.Args = []string{"100"}
factory.configureExecCmd(t, execCmd)
defer allocDir.Destroy()
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
ps, err := executor.Launch(execCmd)
@@ -618,7 +626,7 @@ func TestExecutor_Start_NonExecutableBinaries(t *testing.T) {
execCmd.Cmd = nonExecutablePath
factory.configureExecCmd(t, execCmd)
executor := factory.new(testlog.HCLogger(t), 0)
executor := factory.new(testlog.HCLogger(t))
defer executor.Shutdown("", 0)
// need to configure path in chroot with that file if using isolation executor