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

Merge pull request #5918 from mxpv/shim-manager

Browse Source 
Decouple task manager
This commit is contained in:
Maksym Pavlenko
2021-11-04 16:29:52 +02:00
committed by GitHub
parent bfc714d3a2 d022fbe789
commit b5b83e0512
13 changed files with 461 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/client/container_linux_test.go
View File

@@ -41,7 +41,7 @@ import (
"github.com/containerd/containerd/runtime/linux/runctypes"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/sys"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-spec/specs-go"
exec "golang.org/x/sys/execabs"
"golang.org/x/sys/unix"
)
@@ -430,7 +430,7 @@ func getLogDirPath(runtimeVersion, id string) string {
case "v1":
return filepath.Join(defaultRoot, plugin.RuntimeLinuxV1, testNamespace, id)
case "v2":
return filepath.Join(defaultState, "io.containerd.runtime.v2.task", testNamespace, id)
return filepath.Join(defaultState, "io.containerd.runtime-shim.v2.shim", testNamespace, id)
default:
panic(fmt.Errorf("Unsupported runtime version %s", runtimeVersion))
}