Skip to content

Commit

Permalink
Fix docker driver MemorySwap value
Browse files Browse the repository at this point in the history
Fixes an incorrect value being assigned to MemorySwap when `memory_hard_limit` flag is being used.

Issue raised in hashicorp#8153
  • Loading branch information
njenwei committed Jun 12, 2020
1 parent 723437f commit f316c51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/docker/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
hostConfig.MemorySwap = 0
hostConfig.MemorySwappiness = nil
} else {
hostConfig.MemorySwap = task.Resources.LinuxResources.MemoryLimitBytes // MemorySwap is memory + swap.
hostConfig.MemorySwap = memory

// disable swap explicitly in non-Windows environments
var swapiness int64 = 0
Expand Down

0 comments on commit f316c51

Please sign in to comment.