Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

virtcontainers: reimplement sandbox cgroup #1189

Merged
merged 5 commits into from
Feb 20, 2019
Merged

virtcontainers: reimplement sandbox cgroup #1189

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1c8590
virtcontainers: add method to get hypervisor PID
Jan 28, 2019
9758cdb
virtcontainers: move cpu cgroup implementation
Jan 28, 2019
5201860
virtcontainers: reimplement sandbox cgroup
Jan 28, 2019
62c393c
virtcontainers: change container's state to stop asap
Feb 18, 2019
58d2785
virtcontainers: don't try to talk with the proxy when it's not running
Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions virtcontainers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ func createSandboxFromConfig(ctx context.Context, sandboxConfig SandboxConfig, f
return nil, err
}

// Setup host cgroups
if err = s.setupCgroups(); err != nil {
return nil, err
}

return s, nil
}

Expand Down
11 changes: 7 additions & 4 deletions virtcontainers/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"testing"

"github.com/containernetworking/plugins/pkg/ns"
"github.com/kata-containers/runtime/virtcontainers/pkg/annotations"
"github.com/kata-containers/runtime/virtcontainers/pkg/mock"
vcTypes "github.com/kata-containers/runtime/virtcontainers/pkg/types"
"github.com/kata-containers/runtime/virtcontainers/store"
Expand All @@ -31,13 +32,15 @@ const (
)

var sandboxAnnotations = map[string]string{
"sandbox.foo": "sandbox.bar",
"sandbox.hello": "sandbox.world",
"sandbox.foo": "sandbox.bar",
"sandbox.hello": "sandbox.world",
annotations.ConfigJSONKey: `{"linux":{"resources":{}}}`,
}

var containerAnnotations = map[string]string{
"container.foo": "container.bar",
"container.hello": "container.world",
"container.foo": "container.bar",
"container.hello": "container.world",
annotations.ConfigJSONKey: `{"linux":{"resources":{}}}`,
}

func newBasicTestCmd() types.Cmd {
Expand Down
Loading