From 90eac6b48baac2b74b4721456fee4b3f2a0527b8 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 12 Nov 2015 10:58:20 -0800 Subject: [PATCH] Windows: TP4 fix cpu weight Signed-off-by: John Howard --- daemon/daemon_windows.go | 2 +- daemon/execdriver/windows/run.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/daemon_windows.go b/daemon/daemon_windows.go index 4050e2880b..d5ab73f0d4 100644 --- a/daemon/daemon_windows.go +++ b/daemon/daemon_windows.go @@ -18,7 +18,7 @@ const ( defaultVirtualSwitch = "Virtual Switch" platformSupported = true windowsMinCPUShares = 1 - windowsMaxCPUShares = 9 + windowsMaxCPUShares = 10000 ) func parseSecurityOpt(container *Container, config *runconfig.HostConfig) error { diff --git a/daemon/execdriver/windows/run.go b/daemon/execdriver/windows/run.go index 44ab82258f..d8d1b26c20 100644 --- a/daemon/execdriver/windows/run.go +++ b/daemon/execdriver/windows/run.go @@ -74,7 +74,7 @@ type containerInit struct { IgnoreFlushesDuringBoot bool // Optimisation hint for container startup in Windows LayerFolderPath string // Where the layer folders are located Layers []layer // List of storage layers - ProcessorWeight int64 // CPU Shares 1..9 on Windows; or 0 is platform default. + ProcessorWeight int64 `json:",omitempty"` // CPU Shares 0..10000 on Windows; where 0 will be ommited and HCS will default. HostName string // Hostname MappedDirectories []mappedDir // List of mapped directories (volumes/mounts) SandboxPath string // Location of unmounted sandbox (used for Hyper-V containers, not Windows Server containers)