1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #17949 from Microsoft/jjh/cpuweighttp4

Windows: TP4 fix cpu weight
This commit is contained in:
Vincent Demeester 2015-11-12 21:13:09 +01:00
commit 588fedef4a
2 changed files with 2 additions and 2 deletions

View file

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

View file

@ -74,7 +74,7 @@ type containerInit struct {
IgnoreFlushesDuringBoot bool // Optimisation hint for container startup in Windows IgnoreFlushesDuringBoot bool // Optimisation hint for container startup in Windows
LayerFolderPath string // Where the layer folders are located LayerFolderPath string // Where the layer folders are located
Layers []layer // List of storage layers 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 HostName string // Hostname
MappedDirectories []mappedDir // List of mapped directories (volumes/mounts) MappedDirectories []mappedDir // List of mapped directories (volumes/mounts)
SandboxPath string // Location of unmounted sandbox (used for Hyper-V containers, not Windows Server containers) SandboxPath string // Location of unmounted sandbox (used for Hyper-V containers, not Windows Server containers)