github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2373 from teawater/fix_swap2

Browse Source 
Container: Add initConfigResourcesMemory and call it in newContainer
This commit is contained in:
Fupan Li 2021-08-03 10:58:48 +08:00 committed by GitHub
commit eda55195fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/virtcontainers/container.go
View File

@ -745,6 +745,12 @@ func (c *Container) createBlockDevices(ctx context.Context) error {
return nil return nil
} }
func (c *Container) initConfigResourcesMemory() {
ociSpec := c.GetPatchedOCISpec()
c.config.Resources.Memory = &specs.LinuxMemory{}
ociSpec.Linux.Resources.Memory = c.config.Resources.Memory
}
// newContainer creates a Container structure from a sandbox and a container configuration. // newContainer creates a Container structure from a sandbox and a container configuration.
func newContainer(ctx context.Context, sandbox *Sandbox, contConfig *ContainerConfig) (*Container, error) { func newContainer(ctx context.Context, sandbox *Sandbox, contConfig *ContainerConfig) (*Container, error) {
span, ctx := katatrace.Trace(ctx, sandbox.Logger(), "newContainer", sandbox.tracingTags()) span, ctx := katatrace.Trace(ctx, sandbox.Logger(), "newContainer", sandbox.tracingTags())
@ -778,7 +784,7 @@ func newContainer(ctx context.Context, sandbox *Sandbox, contConfig *ContainerCo
return &Container{}, fmt.Errorf("Invalid container configuration Annotations %s %v", vcAnnotations.ContainerResourcesSwappiness, err) return &Container{}, fmt.Errorf("Invalid container configuration Annotations %s %v", vcAnnotations.ContainerResourcesSwappiness, err)
} }
if c.config.Resources.Memory == nil { if c.config.Resources.Memory == nil {
c.config.Resources.Memory = &specs.LinuxMemory{} c.initConfigResourcesMemory()
} }
c.config.Resources.Memory.Swappiness = &resourceSwappiness c.config.Resources.Memory.Swappiness = &resourceSwappiness
} }
@ -788,7 +794,7 @@ func newContainer(ctx context.Context, sandbox *Sandbox, contConfig *ContainerCo
return &Container{}, fmt.Errorf("Invalid container configuration Annotations %s %v", vcAnnotations.ContainerResourcesSwapInBytes, err) return &Container{}, fmt.Errorf("Invalid container configuration Annotations %s %v", vcAnnotations.ContainerResourcesSwapInBytes, err)
} }
if c.config.Resources.Memory == nil { if c.config.Resources.Memory == nil {
c.config.Resources.Memory = &specs.LinuxMemory{} c.initConfigResourcesMemory()
} }
resourceSwapInBytes := int64(resourceSwapInBytesInUint) resourceSwapInBytes := int64(resourceSwapInBytesInUint)
c.config.Resources.Memory.Swap = &resourceSwapInBytes c.config.Resources.Memory.Swap = &resourceSwapInBytes