luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1480 from hashicorp/b-docker-disable-swap

Browse source 
Disable swap on docker driver
This commit is contained in:
Alex Dadgar 2016-07-28 13:16:22 -07:00 committed by GitHub
parent 6187b6aef8 2999c12ef1
commit 460fb404b4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/driver/docker.go
View file

@ -386,10 +386,11 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
OpenStdin: driverConfig.Interactive, OpenStdin: driverConfig.Interactive,
} }
memLimit := int64(task.Resources.MemoryMB) * 1024 * 1024
hostConfig := &docker.HostConfig{ hostConfig := &docker.HostConfig{
// Convert MB to bytes. This is an absolute value. // Convert MB to bytes. This is an absolute value.
Memory: int64(task.Resources.MemoryMB) * 1024 * 1024, Memory: memLimit,
MemorySwap: -1, MemorySwap: memLimit, // MemorySwap is memory + swap.
// Convert Mhz to shares. This is a relative value. // Convert Mhz to shares. This is a relative value.
CPUShares: int64(task.Resources.CPU), CPUShares: int64(task.Resources.CPU),