Merge pull request #3187 from hashicorp/b-windows-docker

Fix MemorySwappiness on Windows Docker
hashicorp · Sep 11, 2017 · 1bed4b4 · 1bed4b4
2 parents 49c4189 + 7148b65
commit 1bed4b4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -973,8 +973,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
+	} else {
 		hostConfig.MemorySwap = memLimit // MemorySwap is memory + swap.
 	}