From ea3a7899f50f623df58d0ef7e0c5318bddaf1877 Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Fri, 10 Jun 2016 16:24:23 -0700 Subject: [PATCH] Removed QoS validation on Windows Signed-off-by: Darren Stahl --- docs/reference/api/docker_remote_api_v1.24.md | 4 ++-- runconfig/hostconfig_solaris.go | 1 - runconfig/hostconfig_unix.go | 5 ++--- runconfig/hostconfig_windows.go | 9 --------- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index b8fe8bb1c4..0ee368c028 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -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: diff --git a/runconfig/hostconfig_solaris.go b/runconfig/hostconfig_solaris.go index 6bcee7d111..5c2e861202 100644 --- a/runconfig/hostconfig_solaris.go +++ b/runconfig/hostconfig_solaris.go @@ -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 } diff --git a/runconfig/hostconfig_unix.go b/runconfig/hostconfig_unix.go index 1e196f6831..0568791ddd 100644 --- a/runconfig/hostconfig_unix.go +++ b/runconfig/hostconfig_unix.go @@ -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 } diff --git a/runconfig/hostconfig_windows.go b/runconfig/hostconfig_windows.go index c89d0f70c2..d06452db18 100644 --- a/runconfig/hostconfig_windows.go +++ b/runconfig/hostconfig_windows.go @@ -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 }