alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fn: memory limit adjustments (#746)

Browse Source 
1) limit kernel memory which was previously unlimited, using
   same limits as user memory for a unified approach.
2) disable swap memory for containers
This commit is contained in:
Tolga Ceylan
2018-02-07 16:48:52 -08:00
committed by Reed Allman
parent 8b6102f139
commit dc4d90432b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/agent/drivers/docker/docker.go
View File

@@ -134,16 +134,18 @@ func (drv *DockerDriver) Prepare(ctx context.Context, task drivers.ContainerTask
container := docker.CreateContainerOptions{ container := docker.CreateContainerOptions{
Name: task.Id(), Name: task.Id(),
Config: &docker.Config{ Config: &docker.Config{
Env: envvars, Env: envvars,
Cmd: cmd, Cmd: cmd,
Memory: int64(task.Memory()), Memory: int64(task.Memory()),
CPUShares: drv.conf.CPUShares, MemorySwap: int64(task.Memory()), // disables swap
Hostname: drv.hostname, KernelMemory: int64(task.Memory()),
Image: task.Image(), CPUShares: drv.conf.CPUShares,
Volumes: map[string]struct{}{}, Hostname: drv.hostname,
OpenStdin: true, Image: task.Image(),
AttachStdin: true, Volumes: map[string]struct{}{},
StdinOnce: true, OpenStdin: true,
AttachStdin: true,
StdinOnce: true,
}, },
HostConfig: &docker.HostConfig{}, HostConfig: &docker.HostConfig{},
Context: ctx, Context: ctx,