1. docker
  2. Commit ea3a7899f50f623df58d0ef7e0c5318bddaf1877
Browse code

Removed QoS validation on Windows

Signed-off-by: Darren Stahl <darst@microsoft.com>

Darren Stahl authored on 2016/06/11 08:24:23
Showing 4 changed files
docs/reference/api/docker_remote_api_v1.24.md
History View file @ ea3a789
... ... 
@@ -405,8 +405,8 @@ Json Parameters:
405 405 
     -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
406 406 
     -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
407 407 
     -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
408 
-    -   **MaximumIOps** - Maximum IO absolute rate in terms of IOps. MaximumIOps and MaximumIOBps are mutually exclusive settings.
409 
-    -   **MaximumIOBps** - Maximum IO absolute rate in terms of bytes per second. MaximumIOps and MaximumIOBps are mutually exclusive settings.
408 
+    -   **MaximumIOps** - Maximum IO absolute rate in terms of IOps.
409 
+    -   **MaximumIOBps** - Maximum IO absolute rate in terms of bytes per second.
410 410 
     -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
411 411 
     -   **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of:        `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
412 412 
     -   **BlkioDeviceReadBps** - Limit read rate (bytes per second) from a device in the form of:	`"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:
runconfig/hostconfig_solaris.go
History View file @ ea3a789
... ... 
@@ -42,7 +42,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
42 42 
 }
43 43
44 44 
 // ValidateQoS performs platform specific validation of the QoS settings
45 
-// a disk can be limited by either Bps or IOps, but not both.
46 45 
 func ValidateQoS(hc *container.HostConfig) error {
47 46 
 	return nil
48 47 
 }
runconfig/hostconfig_unix.go
History View file @ ea3a789
... ... 
@@ -89,7 +89,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
89 89 
 }
90 90
91 91 
 // ValidateQoS performs platform specific validation of the QoS settings
92 
-// a disk can be limited by either Bps or IOps, but not both.
93 92 
 func ValidateQoS(hc *container.HostConfig) error {
94 93 
 	// We may not be passed a host config, such as in the case of docker commit
95 94 
 	if hc == nil {
... ... 
@@ -97,11 +96,11 @@ func ValidateQoS(hc *container.HostConfig) error {
97 97 
 	}
98 98
99 99 
 	if hc.IOMaximumBandwidth != 0 {
100 
-		return fmt.Errorf("invalid QoS settings: %s does not support --maximum-bandwidth", runtime.GOOS)
100 
+		return fmt.Errorf("invalid QoS settings: %s does not support --io-maxbandwidth", runtime.GOOS)
101 101 
 	}
102 102
103 103 
 	if hc.IOMaximumIOps != 0 {
104 
-		return fmt.Errorf("invalid QoS settings: %s does not support --maximum-iops", runtime.GOOS)
104 
+		return fmt.Errorf("invalid QoS settings: %s does not support --io-maxiops", runtime.GOOS)
105 105 
 	}
106 106 
 	return nil
107 107 
 }
runconfig/hostconfig_windows.go
History View file @ ea3a789
... ... 
@@ -46,15 +46,6 @@ func ValidateIsolation(hc *container.HostConfig) error {
46 46 
 }
47 47
48 48 
 // ValidateQoS performs platform specific validation of the Qos settings
49 
-// a disk can be limited by either Bps or IOps, but not both.
50 49 
 func ValidateQoS(hc *container.HostConfig) error {
51 
-	// We may not be passed a host config, such as in the case of docker commit
52 
-	if hc == nil {
53 
-		return nil
54 
-	}
55 
-
56 
-	if hc.IOMaximumIOps != 0 && hc.IOMaximumBandwidth != 0 {
57 
-		return fmt.Errorf("invalid QoS settings: maximum bandwidth and maximum iops cannot both be set")
58 
-	}
59 50 
 	return nil
60 51 
 }