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

remove systemd cgroup manager

Browse source
This commit is contained in:
Alex Dadgar 2016-04-15 14:55:30 -07:00
parent bd225241b0
commit dba8712b45
1 changed files with 1 additions and 7 deletions
Show stats 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}
}