starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 23:41:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed QoS validation on Windows

Browse Source 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ea3a7899f50f623df58d0ef7e0c5318bddaf1877
Component: engine
This commit is contained in:
Darren Stahl
2016-06-10 16:30:54 -07:00
parent ad3cf97c76
commit 8cfafa6bc0
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/runconfig/hostconfig_solaris.go
-1
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
}
components/engine/runconfig/hostconfig_unix.go
+2 -3
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
}
components/engine/runconfig/hostconfig_windows.go
-9
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
}