github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8066 from fuweid/cleanup-blockio-init

Browse Source 
*: introduce wrapper pkgs for blockio and rdt
This commit is contained in:
Fu Wei
2023-02-13 14:05:32 +08:00
committed by GitHub
parent c6cf6b2522 60d04b0b0f
commit 2654ece1d0
16 changed files with 183 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/sbserver/container_create.go
View File

@@ -36,6 +36,7 @@ import (
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/blockio"
"github.com/containerd/containerd/pkg/cri/annotations"
criconfig "github.com/containerd/containerd/pkg/cri/config"
cio "github.com/containerd/containerd/pkg/cri/io"
@@ -639,7 +640,7 @@ func (c *criService) buildLinuxSpec(
return nil, fmt.Errorf("failed to set blockio class: %w", err)
}
if blockIOClass != "" {
if linuxBlockIO, err := blockIOToLinuxOci(blockIOClass); err == nil {
if linuxBlockIO, err := blockio.ClassNameToLinuxOCI(blockIOClass); err == nil {
specOpts = append(specOpts, oci.WithBlockIO(linuxBlockIO))
} else {
return nil, err