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

Fixed the compilation on linux

Browse Source
This commit is contained in:
Diptanu Choudhury
2016-05-26 00:53:41 -07:00
parent 71d3361f79
commit c99733e8c7
5 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/driver/executor/executor_linux.go
View File

@@ -11,6 +11,7 @@ import (
"time"
"github.com/hashicorp/go-multierror"
"github.com/mitchellh/go-ps"
"github.com/opencontainers/runc/libcontainer/cgroups"
cgroupFs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
cgroupConfig "github.com/opencontainers/runc/libcontainer/configs"
@@ -130,7 +131,11 @@ func (e *UniversalExecutor) configureCgroups(resources *structs.Resources) error
// the executor.
func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
if !e.command.ResourceLimits {
return e.resourceUsagePids()
pidStats, err := e.pidStats()
if err != nil {
return nil, err
}
return e.aggregatedResourceUsage(pidStats), nil
}
ts := time.Now()
manager := getCgroupManager(e.groups, e.cgPaths)
@@ -178,7 +183,7 @@ func (e *UniversalExecutor) Stats() (*cstructs.TaskResourceUsage, error) {
},
Timestamp: ts,
}
if pidStats, err := e.PidStats(); err == nil {
if pidStats, err := e.pidStats(); err == nil {
taskResUsage.Pids = pidStats
}
return &taskResUsage, nil
@@ -254,20 +259,24 @@ func (e *UniversalExecutor) removeChrootMounts() error {
return e.ctx.AllocDir.UnmountAll()
}
func (e *UniversalExecutor) getAllPids() ([]*NomadPid, error) {
func (e *UniversalExecutor) getAllPids() ([]*nomadPid, error) {
if e.command.ResourceLimits {
manager := getCgroupManager(e.groups, e.cgPaths)
pids, err := manager.GetAllPids()
if err != nil {
return nil, err
}
np := make([]*NomadPid, len(pids))
np := make([]*nomadPid, len(pids))
for idx, pid := range pids {
np[idx] = &NomadPid{pid, stats.NewCpuStats()}
np[idx] = &nomadPid{pid, stats.NewCpuStats()}
}
return np, nil
}
return e.scanPids()
allProcesses, err := ps.Processes()
if err != nil {
return nil, err
}
return e.scanPids(os.Getpid(), allProcesses)
}
// destroyCgroup kills all processes in the cgroup and removes the cgroup