virtcontainer/cgroup: create cgroup manager after creating the network

Create the cgroup manager once the network has been created, this way the list of device will include the network VFIO devices attached to the sandbox, when the physical enpoint is the network driver. fixes #2774 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Jun 29, 2020 · 74a4258 · 74a4258
1 parent c2c3b87
commit 74a4258
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/virtcontainers/api.go b/virtcontainers/api.go
@@ -102,6 +102,10 @@ func createSandboxFromConfig(ctx context.Context, sandboxConfig SandboxConfig, f
 
 	// Move runtime to sandbox cgroup so all process are created there.
 	if s.config.SandboxCgroupOnly {
+		if err := s.createCgroupManager(); err != nil {
+			return nil, err
+		}
+
 		if err := s.setupSandboxCgroup(); err != nil {
 			return nil, err
 		}

diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -606,10 +606,6 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
 		}
 	}
 
-	if err := s.createCgroupManager(); err != nil {
-		return nil, err
-	}
-
 	agentConfig, err := newAgentConfig(sandboxConfig.AgentType, sandboxConfig.AgentConfig)
 	if err != nil {
 		return nil, err
@@ -739,6 +735,12 @@ func fetchSandbox(ctx context.Context, sandboxID string) (sandbox *Sandbox, err
 		return nil, fmt.Errorf("failed to create sandbox with config %+v: %v", config, err)
 	}
 
+	if sandbox.config.SandboxCgroupOnly {
+		if err := sandbox.createCgroupManager(); err != nil {
+			return nil, err
+		}
+	}
+
 	// This sandbox already exists, we don't need to recreate the containers in the guest.
 	// We only need to fetch the containers from storage and create the container structs.
 	if err := sandbox.fetchContainers(); err != nil {