github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 04:04:45 +00:00
Code Issues Projects Releases Wiki Activity

runtime/virtcontainers: Pass the hugepages resources to agent

Browse Source 
The hugepages resources claimed by containers should be limited
by cgroup in the guest OS.

Fixes: #3695

Signed-off-by: Miao Xia <xia.miao1@zte.com.cn>
This commit is contained in:
Miao Xia 2022-02-17 11:15:36 +08:00 committed by miao.xia
parent 9e618f1fb2
commit a2f5c1768e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/virtcontainers/kata_agent.go
View File

@ -1050,7 +1050,6 @@ func (k *kataAgent) constrainGRPCSpec(grpcSpec *grpc.Spec, passSeccomp bool, str
grpcSpec.Linux.Resources.Devices = nil grpcSpec.Linux.Resources.Devices = nil
grpcSpec.Linux.Resources.Pids = nil grpcSpec.Linux.Resources.Pids = nil
grpcSpec.Linux.Resources.BlockIO = nil grpcSpec.Linux.Resources.BlockIO = nil
grpcSpec.Linux.Resources.HugepageLimits = nil
grpcSpec.Linux.Resources.Network = nil grpcSpec.Linux.Resources.Network = nil
if grpcSpec.Linux.Resources.CPU != nil { if grpcSpec.Linux.Resources.CPU != nil {
grpcSpec.Linux.Resources.CPU.Cpus = "" grpcSpec.Linux.Resources.CPU.Cpus = ""

2
src/runtime/virtcontainers/kata_agent_test.go
View File

@ -598,7 +598,7 @@ func TestConstrainGRPCSpec(t *testing.T) {
assert.NotNil(g.Linux.Resources.Memory) assert.NotNil(g.Linux.Resources.Memory)
assert.Nil(g.Linux.Resources.Pids) assert.Nil(g.Linux.Resources.Pids)
assert.Nil(g.Linux.Resources.BlockIO) assert.Nil(g.Linux.Resources.BlockIO)
assert.Nil(g.Linux.Resources.HugepageLimits) assert.Len(g.Linux.Resources.HugepageLimits, 0)
assert.Nil(g.Linux.Resources.Network) assert.Nil(g.Linux.Resources.Network)
assert.NotNil(g.Linux.Resources.CPU) assert.NotNil(g.Linux.Resources.CPU)
assert.Equal(g.Process.SelinuxLabel, "") assert.Equal(g.Process.SelinuxLabel, "")