Pass cgroup manager to oci runtime manager

mrunalp · mrunalp · commit 5eab56e002f7 · 2016-12-19T15:05:32.000-08:00
Signed-off-by: Mrunal Patel &lt;mpatel@redhat.com&gt;
diff --git a/oci/oci.go b/oci/oci.go
@@ -34,24 +34,26 @@ const (
 )
 
 // New creates a new Runtime with options provided
-func New(runtimePath string, containerDir string, conmonPath string, conmonEnv []string) (*Runtime, error) {
+func New(runtimePath string, containerDir string, conmonPath string, conmonEnv []string, cgroupManager string) (*Runtime, error) {
 	r := &Runtime{
-		name:         filepath.Base(runtimePath),
-		path:         runtimePath,
-		containerDir: containerDir,
-		conmonPath:   conmonPath,
-		conmonEnv:    conmonEnv,
+		name:          filepath.Base(runtimePath),
+		path:          runtimePath,
+		containerDir:  containerDir,
+		conmonPath:    conmonPath,
+		conmonEnv:     conmonEnv,
+		cgroupManager: cgroupManager,
 	}
 	return r, nil
 }
 
 // Runtime stores the information about a oci runtime
 type Runtime struct {
-	name         string
-	path         string
-	containerDir string
-	conmonPath   string
-	conmonEnv    []string
+	name          string
+	path          string
+	containerDir  string
+	conmonPath    string
+	conmonEnv     []string
+	cgroupManager string
 }
 
 // syncInfo is used to return data from monitor process to daemon
diff --git a/server/server.go b/server/server.go
@@ -304,7 +304,7 @@ func New(config *Config) (*Server, error) {
 		return nil, err
 	}
 
-	r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon, config.ConmonEnv)
+	r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon, config.ConmonEnv, config.CgroupManager)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func New(config Config) (Server, error) {`
`304`	`304`	`return nil, err`
`305`	`305`	`}`
`306`	`306`
`307`		`- r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon, config.ConmonEnv)`
	`307`	`+ r, err := oci.New(config.Runtime, config.ContainerDir, config.Conmon, config.ConmonEnv, config.CgroupManager)`
`308`	`308`	`if err != nil {`
`309`	`309`	`return nil, err`
`310`	`310`	`}`