2016-12-23 14:09:12 -05:00
package opts
import (
"fmt"
"strconv"
"strings"
"github.com/docker/docker/api/types/blkiodev"
"github.com/docker/go-units"
)
// ValidatorThrottleFctType defines a validator function that returns a validated struct and/or an error.
type ValidatorThrottleFctType func ( val string ) ( * blkiodev . ThrottleDevice , error )
// ValidateThrottleBpsDevice validates that the specified string has a valid device-rate format.
func ValidateThrottleBpsDevice ( val string ) ( * blkiodev . ThrottleDevice , error ) {
split := strings . SplitN ( val , ":" , 2 )
if len ( split ) != 2 {
return nil , fmt . Errorf ( "bad format: %s" , val )
}
if ! strings . HasPrefix ( split [ 0 ] , "/dev/" ) {
return nil , fmt . Errorf ( "bad format for device path: %s" , val )
}
rate , err := units . RAMInBytes ( split [ 1 ] )
if err != nil {
return nil , fmt . Errorf ( "invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb" , val )
}
if rate < 0 {
return nil , fmt . Errorf ( "invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb" , val )
}
return & blkiodev . ThrottleDevice {
Path : split [ 0 ] ,
Rate : uint64 ( rate ) ,
} , nil
}
// ValidateThrottleIOpsDevice validates that the specified string has a valid device-rate format.
func ValidateThrottleIOpsDevice ( val string ) ( * blkiodev . ThrottleDevice , error ) {
split := strings . SplitN ( val , ":" , 2 )
if len ( split ) != 2 {
return nil , fmt . Errorf ( "bad format: %s" , val )
}
if ! strings . HasPrefix ( split [ 0 ] , "/dev/" ) {
return nil , fmt . Errorf ( "bad format for device path: %s" , val )
}
rate , err := strconv . ParseUint ( split [ 1 ] , 10 , 64 )
if err != nil {
return nil , fmt . Errorf ( "invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer" , val )
}
if rate < 0 {
return nil , fmt . Errorf ( "invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer" , val )
}
2017-06-09 16:41:53 -04:00
return & blkiodev . ThrottleDevice { Path : split [ 0 ] , Rate : rate } , nil
2016-12-23 14:09:12 -05:00
}
// ThrottledeviceOpt defines a map of ThrottleDevices
type ThrottledeviceOpt struct {
values [ ] * blkiodev . ThrottleDevice
validator ValidatorThrottleFctType
}
// NewThrottledeviceOpt creates a new ThrottledeviceOpt
func NewThrottledeviceOpt ( validator ValidatorThrottleFctType ) ThrottledeviceOpt {
values := [ ] * blkiodev . ThrottleDevice { }
return ThrottledeviceOpt {
values : values ,
validator : validator ,
}
}
// Set validates a ThrottleDevice and sets its name as a key in ThrottledeviceOpt
func ( opt * ThrottledeviceOpt ) Set ( val string ) error {
var value * blkiodev . ThrottleDevice
if opt . validator != nil {
v , err := opt . validator ( val )
if err != nil {
return err
}
value = v
}
( opt . values ) = append ( ( opt . values ) , value )
return nil
}
// String returns ThrottledeviceOpt values as a string.
func ( opt * ThrottledeviceOpt ) String ( ) string {
var out [ ] string
for _ , v := range opt . values {
out = append ( out , v . String ( ) )
}
return fmt . Sprintf ( "%v" , out )
}
// GetList returns a slice of pointers to ThrottleDevices.
func ( opt * ThrottledeviceOpt ) GetList ( ) [ ] * blkiodev . ThrottleDevice {
var throttledevice [ ] * blkiodev . ThrottleDevice
throttledevice = append ( throttledevice , opt . values ... )
return throttledevice
}
// Type returns the option type
func ( opt * ThrottledeviceOpt ) Type ( ) string {
Improve usage output for docker run
Commit a77f2450c70312f8c26877a18bfe2baa44d4abb9 switched `docker run`
to use the `pflags` package. Due to this change, the usage output for
the `--blkio-weight-device` and `--device-*` flags changed and now
showed `weighted-device`, and `throttled-device` as value type. As a
result, the output of `docker run --help` became a lot wider.
This patch changes the output to show `list` instead, which is
consistent with other options that allow to be set multiple times.
Output before this change;
Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
Run a command in a new container
Options:
--blkio-weight uint16 Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)
--blkio-weight-device weighted-device Block IO weight (relative device weight) (default [])
--device list Add a host device to the container (default [])
--device-read-bps throttled-device Limit read rate (bytes per second) from a device (default [])
--device-read-iops throttled-device Limit read rate (IO per second) from a device (default [])
--device-write-bps throttled-device Limit write rate (bytes per second) to a device (default [])
--device-write-iops throttled-device Limit write rate (IO per second) to a device (default [])
-w, --workdir string Working directory inside the container
Output after this change;
Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
Run a command in a new container
Options:
--blkio-weight uint16 Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)
--blkio-weight-device list Block IO weight (relative device weight) (default [])
--device list Add a host device to the container (default [])
--device-read-bps list Limit read rate (bytes per second) from a device (default [])
--device-read-iops list Limit read rate (IO per second) from a device (default [])
--device-write-bps list Limit write rate (bytes per second) to a device (default [])
--device-write-iops list Limit write rate (IO per second) to a device (default [])
-w, --workdir string Working directory inside the container
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-30 11:35:46 -05:00
return "list"
2016-12-23 14:09:12 -05:00
}