Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MemorySwappiness on Windows Docker #3187

Merged
merged 1 commit into from
Sep 11, 2017
Merged

Fix MemorySwappiness on Windows Docker #3187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions client/driver/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,11 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
VolumeDriver: driverConfig.VolumeDriver,
}

// Windows does not support MemorySwap #2193
if runtime.GOOS != "windows" {
// Windows does not support MemorySwap/MemorySwappiness #2193
if runtime.GOOS == "windows" {
hostConfig.MemorySwap = 0
hostConfig.MemorySwappiness = -1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you have the 0 and -1 switched judging by the API docs here: https://docs.docker.com/engine/api/v1.31/#operation/ContainerUpdate (search for "swappiness")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One would wish this was documented better :) I actually brought up a windows server and this is the only config that works. -1 disables snappiness since the valid inputs are 0-100 and MemorySwap has to be 0 as well since there is no support for any swap.

} else {
hostConfig.MemorySwap = memLimit // MemorySwap is memory + swap.
}

Expand Down