Merge pull request #17949 from Microsoft/jjh/cpuweighttp4

Windows: TP4 fix cpu weight
Upstream-commit: 588fedef4af1550f631a71ef1bd98998bc031613
Component: engine

components/engine/daemon/daemon_windows.go

@@ -19,7 +19,7 @@ const (
 	defaultVirtualSwitch = "Virtual Switch"
 	platformSupported    = true
 	windowsMinCPUShares  = 1
-	windowsMaxCPUShares  = 9
+	windowsMaxCPUShares  = 10000
 )
 
 func getBlkioWeightDevices(config *runconfig.HostConfig) ([]*blkiodev.WeightDevice, error) {

components/engine/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)