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

Merge pull request #1103 from hashicorp/b-remove-systemd

Browse Source 
Remove systemd cgroup manager
This commit is contained in:
Alex Dadgar
2016-04-15 16:35:00 -07:00
parent 8db28078ae 9f1976ef3e
commit db0fbf73e3
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/opencontainers/runc/libcontainer/cgroups"
cgroupFs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
cgroupConfig "github.com/opencontainers/runc/libcontainer/configs"
"github.com/hashicorp/nomad/client/allocdir"
@@ -219,10 +218,5 @@ func DestroyCgroup(groups *cgroupConfig.Cgroup, cgPaths map[string]string) error
// getCgroupManager returns the correct libcontainer cgroup manager.
func getCgroupManager(groups *cgroupConfig.Cgroup, paths map[string]string) cgroups.Manager {
var manager cgroups.Manager
manager = &cgroupFs.Manager{Cgroups: groups, Paths: paths}
if systemd.UseSystemd() {
manager = &systemd.Manager{Cgroups: groups, Paths: paths}
}
return manager
return &cgroupFs.Manager{Cgroups: groups, Paths: paths}
}