luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Push down the Linux-specific bits into resourceContainer

Browse source
This commit is contained in:
Sean Chittenden 2016-07-10 00:06:53 -07:00
parent 6fc269d2a6
commit fc9cd8d4af
No known key found for this signature in database
GPG key ID: 4EBC9DC16C2E5E16
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
client/driver/executor/executor_linux.go
View file

@ -68,7 +68,7 @@ func (e *UniversalExecutor) applyLimits(pid int) error {
}
// Entering the process in the cgroup
manager := getCgroupManager(e.groups, nil)
manager := getCgroupManager(e.resCon.groups, nil)
if err := manager.Apply(pid); err != nil {
e.logger.Printf("[ERR] executor: error applying pid to cgroup: %v", err)
if er := e.removeChrootMounts(); er != nil {
@ -76,11 +76,11 @@ func (e *UniversalExecutor) applyLimits(pid int) error {
}
return err
}
e.cgPaths = manager.GetPaths()
cgConfig := cgroupConfig.Config{Cgroups: e.groups}
e.resCon.cgPaths = manager.GetPaths()
cgConfig := cgroupConfig.Config{Cgroups: e.resCon.groups}
if err := manager.Set(&cgConfig); err != nil {
e.logger.Printf("[ERR] executor: error setting cgroup config: %v", err)
if er := DestroyCgroup(e.groups, e.cgPaths, os.Getpid()); er != nil {
if er := DestroyCgroup(e.resCon.groups, e.resCon.cgPaths, os.Getpid()); er != nil {
e.logger.Printf("[ERR] executor: error destroying cgroup: %v", er)
}
if er := e.removeChrootMounts(); er != nil {
@ -94,19 +94,19 @@ func (e *UniversalExecutor) applyLimits(pid int) error {
// configureCgroups converts a Nomad Resources specification into the equivalent
// cgroup configuration. It returns an error if the resources are invalid.
func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error {
e.groups = &cgroupConfig.Cgroup{}
e.groups.Resources = &cgroupConfig.Resources{}
e.resCon.groups = &cgroupConfig.Cgroup{}
e.resCon.groups.Resources = &cgroupConfig.Resources{}
cgroupName := structs.GenerateUUID()
e.groups.Path = filepath.Join("/nomad", cgroupName)
e.resCon.groups.Path = filepath.Join("/nomad", cgroupName)
// TODO: verify this is needed for things like network access
e.groups.Resources.AllowAllDevices = true
e.resCon.groups.Resources.AllowAllDevices = true
if resources.MemoryMB > 0 {
// Total amount of memory allowed to consume
e.groups.Resources.Memory = int64(resources.MemoryMB * 1024 * 1024)
e.resCon.groups.Resources.Memory = int64(resources.MemoryMB * 1024 * 1024)
// Disable swap to avoid issues on the machine
e.groups.Resources.MemorySwap = int64(-1)
e.resCon.groups.Resources.MemorySwap = int64(-1)
}
if resources.CPU < 2 {
@ -114,7 +114,7 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
}
// Set the relative CPU shares for this cgroup.
e.groups.Resources.CpuShares = int64(resources.CPU)
e.resCon.groups.Resources.CpuShares = int64(resources.CPU)
if resources.IOPS != 0 {
// Validate it is in an acceptable range.
@ -122,7 +122,7 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
return fmt.Errorf("resources.IOPS must be between 10 and 1000: %d", resources.IOPS)
}
e.groups.Resources.BlkioWeight = uint16(resources.IOPS)
e.resCon.groups.Resources.BlkioWeight = uint16(resources.IOPS)
}
return nil
@ -140,7 +140,7 @@ func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
return e.aggregatedResourceUsage(pidStats), nil
}
ts := time.Now()
manager := getCgroupManager(e.groups, e.cgPaths)
manager := getCgroupManager(e.resCon.groups, e.resCon.cgPaths)
stats, err := manager.GetStats()
if err != nil {
return nil, err
@ -266,7 +266,7 @@ func (e *UniversalExecutor) removeChrootMounts() error {
// isolation
func (e *UniversalExecutor) getAllPids() (map[int]*nomadPid, error) {
if e.command.ResourceLimits {
manager := getCgroupManager(e.groups, e.cgPaths)
manager := getCgroupManager(e.resCon.groups, e.resCon.cgPaths)
pids, err := manager.GetAllPids()
if err != nil {
return nil, err