github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 15:07:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2808 from liubin/fix/2805-fix-test-leak-of-monitor-socket

Browse Source 
runtime: don't start shim management server in tests
This commit is contained in:
Bin Liu 2021-10-08 19:42:09 +08:00 committed by GitHub
commit 0300e91cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/pkg/containerd-shim-v2/create.go
View File

@ -39,6 +39,13 @@ import (
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/oci" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/oci"
) )
type startManagementServerFunc func(s *service, ctx context.Context, ociSpec *specs.Spec)
var defaultStartManagementServerFunc startManagementServerFunc = func(s *service, ctx context.Context, ociSpec *specs.Spec) {
go s.startManagementServer(ctx, ociSpec)
shimLog.Info("management server started")
}
func create(ctx context.Context, s *service, r *taskAPI.CreateTaskRequest) (*container, error) { func create(ctx context.Context, s *service, r *taskAPI.CreateTaskRequest) (*container, error) {
rootFs := vc.RootFs{} rootFs := vc.RootFs{}
if len(r.Rootfs) == 1 { if len(r.Rootfs) == 1 {
@ -131,7 +138,9 @@ func create(ctx context.Context, s *service, r *taskAPI.CreateTaskRequest) (*con
} }
s.hpid = uint32(pid) s.hpid = uint32(pid)
go s.startManagementServer(ctx, ociSpec) if defaultStartManagementServerFunc != nil {
defaultStartManagementServerFunc(s, ctx, ociSpec)
}
case vc.PodContainer: case vc.PodContainer:
span, ctx := katatrace.Trace(s.ctx, shimLog, "create", shimTracingTags) span, ctx := katatrace.Trace(s.ctx, shimLog, "create", shimTracingTags)

4
src/runtime/pkg/containerd-shim-v2/utils_test.go
View File

@ -125,6 +125,10 @@ func init() {
} }
tc = ktu.NewTestConstraint(false) tc = ktu.NewTestConstraint(false)
// disable shim management server.
// all tests are not using this, so just set it to nil
defaultStartManagementServerFunc = nil
} }
// createOCIConfig creates an OCI configuration (spec) file in // createOCIConfig creates an OCI configuration (spec) file in