Updated Throttle Read/Write to match upstream changes in runc; now ta…

…kes a list of ThrottleDevice structs instead of an int
hashicorp · Oct 6, 2015 · 095dc9a · 095dc9a
1 parent bfbdd19
commit 095dc9a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/client/executor/exec_linux.go b/client/executor/exec_linux.go
@@ -205,8 +205,11 @@ func (e *LinuxExecutor) configureCgroups(resources *structs.Resources) {
 	}
 
 	if resources.IOPS > 0 {
-		e.groups.BlkioThrottleReadIOpsDevice = strconv.FormatInt(int64(resources.IOPS), 10)
-		e.groups.BlkioThrottleWriteIOpsDevice = strconv.FormatInt(int64(resources.IOPS), 10)
+		throttleDevice := &cgroupConfig.ThrottleDevice{
+			Rate: uint64(resources.IOPS),
+		}
+		e.groups.BlkioThrottleReadIOPSDevice = append(e.groups.BlkioThrottleReadIOPSDevice, throttleDevice)
+		e.groups.BlkioThrottleWriteIOPSDevice = append(e.groups.BlkioThrottleWriteIOPSDevice, throttleDevice)
 	}
 }