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

Removed QoS validation on Windows

Browse source 
Signed-off-by: Darren Stahl <darst@microsoft.com>
This commit is contained in:
Darren Stahl 2016-06-10 16:24:23 -07:00
parent ee8c512dc3
commit ea3a7899f5
4 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/reference/api/docker_remote_api_v1.24.md
View file

@ -405,8 +405,8 @@ Json Parameters:
- **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
- **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
- **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
- **MaximumIOps** - Maximum IO absolute rate in terms of IOps. MaximumIOps and MaximumIOBps are mutually exclusive settings.
- **MaximumIOBps** - Maximum IO absolute rate in terms of bytes per second. MaximumIOps and MaximumIOBps are mutually exclusive settings.
- **MaximumIOps** - Maximum IO absolute rate in terms of IOps.
- **MaximumIOBps** - Maximum IO absolute rate in terms of bytes per second.
- **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
- **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of: `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
- **BlkioDeviceReadBps** - Limit read rate (bytes per second) from a device in the form of: `"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:

1
runconfig/hostconfig_solaris.go
View file

@ -42,7 +42,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
}
// ValidateQoS performs platform specific validation of the QoS settings
// a disk can be limited by either Bps or IOps, but not both.
func ValidateQoS(hc *container.HostConfig) error {
return nil
}

5
runconfig/hostconfig_unix.go
View file

@ -89,7 +89,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
}
// ValidateQoS performs platform specific validation of the QoS settings
// a disk can be limited by either Bps or IOps, but not both.
func ValidateQoS(hc *container.HostConfig) error {
// We may not be passed a host config, such as in the case of docker commit
if hc == nil {
@ -97,11 +96,11 @@ func ValidateQoS(hc *container.HostConfig) error {
}
if hc.IOMaximumBandwidth != 0 {
return fmt.Errorf("invalid QoS settings: %s does not support --maximum-bandwidth", runtime.GOOS)
return fmt.Errorf("invalid QoS settings: %s does not support --io-maxbandwidth", runtime.GOOS)
}
if hc.IOMaximumIOps != 0 {
return fmt.Errorf("invalid QoS settings: %s does not support --maximum-iops", runtime.GOOS)
return fmt.Errorf("invalid QoS settings: %s does not support --io-maxiops", runtime.GOOS)
}
return nil
}

9
runconfig/hostconfig_windows.go
View file

@ -46,15 +46,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
}
// ValidateQoS performs platform specific validation of the Qos settings
// a disk can be limited by either Bps or IOps, but not both.
func ValidateQoS(hc *container.HostConfig) error {
// We may not be passed a host config, such as in the case of docker commit
if hc == nil {
return nil
}
if hc.IOMaximumIOps != 0 && hc.IOMaximumBandwidth != 0 {
return fmt.Errorf("invalid QoS settings: maximum bandwidth and maximum iops cannot both be set")
}
return nil
}