ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Use uint64 for Bandwidth plugin

Browse Source 
Signed-off-by: Ashley Reese <ashley@victorianfox.com>
This commit is contained in:
Ashley Reese 2019-09-19 10:18:28 +02:00
parent 291ab6cc84
commit 0dff883769
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/meta/bandwidth/ifb_creator.go
View File

@ -50,7 +50,7 @@ func TeardownIfb(deviceName string) error {
return err return err
} }
func CreateIngressQdisc(rateInBits, burstInBits int, hostDeviceName string) error { func CreateIngressQdisc(rateInBits, burstInBits uint64, hostDeviceName string) error {
hostDevice, err := netlink.LinkByName(hostDeviceName) hostDevice, err := netlink.LinkByName(hostDeviceName)
if err != nil { if err != nil {
return fmt.Errorf("get host device: %s", err) return fmt.Errorf("get host device: %s", err)
@ -58,7 +58,7 @@ func CreateIngressQdisc(rateInBits, burstInBits int, hostDeviceName string) erro
return createTBF(rateInBits, burstInBits, hostDevice.Attrs().Index) return createTBF(rateInBits, burstInBits, hostDevice.Attrs().Index)
} }
func CreateEgressQdisc(rateInBits, burstInBits int, hostDeviceName string, ifbDeviceName string) error { func CreateEgressQdisc(rateInBits, burstInBits uint64, hostDeviceName string, ifbDeviceName string) error {
ifbDevice, err := netlink.LinkByName(ifbDeviceName) ifbDevice, err := netlink.LinkByName(ifbDeviceName)
if err != nil { if err != nil {
return fmt.Errorf("get ifb device: %s", err) return fmt.Errorf("get ifb device: %s", err)
@ -113,7 +113,7 @@ func CreateEgressQdisc(rateInBits, burstInBits int, hostDeviceName string, ifbDe
return nil return nil
} }
func createTBF(rateInBits, burstInBits, linkIndex int) error { func createTBF(rateInBits, burstInBits uint64, linkIndex int) error {
// Equivalent to // Equivalent to
// tc qdisc add dev link root tbf // tc qdisc add dev link root tbf
// rate netConf.BandwidthLimits.Rate // rate netConf.BandwidthLimits.Rate

13
plugins/meta/bandwidth/main.go
View File

@ -17,6 +17,7 @@ package main
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"math"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
@ -37,11 +38,11 @@ const ifbDevicePrefix = "bwp"
// BandwidthEntry corresponds to a single entry in the bandwidth argument, // BandwidthEntry corresponds to a single entry in the bandwidth argument,
// see CONVENTIONS.md // see CONVENTIONS.md
type BandwidthEntry struct { type BandwidthEntry struct {
IngressRate int `json:"ingressRate"` //Bandwidth rate in bps for traffic through container. 0 for no limit. If ingressRate is set, ingressBurst must also be set IngressRate uint64 `json:"ingressRate"` //Bandwidth rate in bps for traffic through container. 0 for no limit. If ingressRate is set, ingressBurst must also be set
IngressBurst int `json:"ingressBurst"` //Bandwidth burst in bits for traffic through container. 0 for no limit. If ingressBurst is set, ingressRate must also be set IngressBurst uint64 `json:"ingressBurst"` //Bandwidth burst in bits for traffic through container. 0 for no limit. If ingressBurst is set, ingressRate must also be set
EgressRate int `json:"egressRate"` //Bandwidth rate in bps for traffic through container. 0 for no limit. If egressRate is set, egressBurst must also be set EgressRate uint64 `json:"egressRate"` //Bandwidth rate in bps for traffic through container. 0 for no limit. If egressRate is set, egressBurst must also be set
EgressBurst int `json:"egressBurst"` //Bandwidth burst in bits for traffic through container. 0 for no limit. If egressBurst is set, egressRate must also be set EgressBurst uint64 `json:"egressBurst"` //Bandwidth burst in bits for traffic through container. 0 for no limit. If egressBurst is set, egressRate must also be set
} }
func (bw *BandwidthEntry) isZero() bool { func (bw *BandwidthEntry) isZero() bool {
@ -101,7 +102,7 @@ func getBandwidth(conf *PluginConf) *BandwidthEntry {
return conf.BandwidthEntry return conf.BandwidthEntry
} }
func validateRateAndBurst(rate int, burst int) error { func validateRateAndBurst(rate, burst uint64) error {
switch { switch {
case burst < 0 || rate < 0: case burst < 0 || rate < 0:
return fmt.Errorf("rate and burst must be a positive integer") return fmt.Errorf("rate and burst must be a positive integer")
@ -109,6 +110,8 @@ func validateRateAndBurst(rate int, burst int) error {
return fmt.Errorf("if rate is set, burst must also be set") return fmt.Errorf("if rate is set, burst must also be set")
case rate == 0 && burst != 0: case rate == 0 && burst != 0:
return fmt.Errorf("if burst is set, rate must also be set") return fmt.Errorf("if burst is set, rate must also be set")
case burst/8 >= math.MaxUint32:
return fmt.Errorf("burst cannot be more than 4GB")
} }
return nil return nil