vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

*: constify cgroups stuff

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-08-29 23:11:30 +02:00
parent c199f63dba
commit f51ca87857
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
oci/oci.go
View file

@ -30,6 +30,11 @@ const (
ContainerStateStopped = "stopped"
// ContainerCreateTimeout represents the value of container creating timeout
ContainerCreateTimeout = 10 * time.Second
// CgroupfsCgroupsManager represents cgroupfs native cgroup manager
CgroupfsCgroupsManager = "cgroupfs"
// SystemdCgroupsManager represents systemd native cgroup manager
SystemdCgroupsManager = "systemd"
)
// New creates a new Runtime with options provided
@ -141,7 +146,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
defer parentStartPipe.Close()
var args []string
if r.cgroupManager == "systemd" {
if r.cgroupManager == SystemdCgroupsManager {
args = append(args, "-s")
}
args = append(args, "-c", c.id)
@ -187,7 +192,7 @@ func (r *Runtime) CreateContainer(c *Container, cgroupParent string) error {
childStartPipe.Close()
// Move conmon to specified cgroup
if r.cgroupManager == "systemd" {
if r.cgroupManager == SystemdCgroupsManager {
logrus.Infof("Running conmon under slice %s and unitName %s", cgroupParent, createUnitName("crio-conmon", c.id))
if err = utils.RunUnderSystemdScope(cmd.Process.Pid, cgroupParent, createUnitName("crio-conmon", c.id)); err != nil {
logrus.Warnf("Failed to add conmon to systemd sandbox cgroup: %v", err)