github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91267 from gnufied/fix-overflow-error-string

Browse Source 
Overflow errors look weird in string format
This commit is contained in:
Kubernetes Prow Robot 2020-05-19 20:35:36 -07:00 committed by GitHub
commit ebcae8ff2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
staging/src/k8s.io/cloud-provider/volume/helpers/rounding.go
View File

@ -43,7 +43,7 @@ const (
func RoundUpToGiB(size resource.Quantity) (int64, error) { func RoundUpToGiB(size resource.Quantity) (int64, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSize(requestBytes, GiB), nil return roundUpSize(requestBytes, GiB), nil
} }
@ -52,7 +52,7 @@ func RoundUpToGiB(size resource.Quantity) (int64, error) {
func RoundUpToMB(size resource.Quantity) (int64, error) { func RoundUpToMB(size resource.Quantity) (int64, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSize(requestBytes, MB), nil return roundUpSize(requestBytes, MB), nil
} }
@ -61,7 +61,7 @@ func RoundUpToMB(size resource.Quantity) (int64, error) {
func RoundUpToMiB(size resource.Quantity) (int64, error) { func RoundUpToMiB(size resource.Quantity) (int64, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSize(requestBytes, MiB), nil return roundUpSize(requestBytes, MiB), nil
} }
@ -70,7 +70,7 @@ func RoundUpToMiB(size resource.Quantity) (int64, error) {
func RoundUpToKB(size resource.Quantity) (int64, error) { func RoundUpToKB(size resource.Quantity) (int64, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSize(requestBytes, KB), nil return roundUpSize(requestBytes, KB), nil
} }
@ -79,7 +79,7 @@ func RoundUpToKB(size resource.Quantity) (int64, error) {
func RoundUpToKiB(size resource.Quantity) (int64, error) { func RoundUpToKiB(size resource.Quantity) (int64, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSize(requestBytes, KiB), nil return roundUpSize(requestBytes, KiB), nil
} }
@ -89,7 +89,7 @@ func RoundUpToKiB(size resource.Quantity) (int64, error) {
func RoundUpToGiBInt(size resource.Quantity) (int, error) { func RoundUpToGiBInt(size resource.Quantity) (int, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSizeInt(requestBytes, GiB) return roundUpSizeInt(requestBytes, GiB)
} }
@ -99,7 +99,7 @@ func RoundUpToGiBInt(size resource.Quantity) (int, error) {
func RoundUpToMBInt(size resource.Quantity) (int, error) { func RoundUpToMBInt(size resource.Quantity) (int, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSizeInt(requestBytes, MB) return roundUpSizeInt(requestBytes, MB)
} }
@ -109,7 +109,7 @@ func RoundUpToMBInt(size resource.Quantity) (int, error) {
func RoundUpToMiBInt(size resource.Quantity) (int, error) { func RoundUpToMiBInt(size resource.Quantity) (int, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSizeInt(requestBytes, MiB) return roundUpSizeInt(requestBytes, MiB)
} }
@ -119,7 +119,7 @@ func RoundUpToMiBInt(size resource.Quantity) (int, error) {
func RoundUpToKBInt(size resource.Quantity) (int, error) { func RoundUpToKBInt(size resource.Quantity) (int, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSizeInt(requestBytes, KB) return roundUpSizeInt(requestBytes, KB)
} }
@ -136,7 +136,7 @@ func RoundUpToKiBInt(size resource.Quantity) (int, error) {
func RoundUpToGiBInt32(size resource.Quantity) (int32, error) { func RoundUpToGiBInt32(size resource.Quantity) (int32, error) {
requestBytes, ok := size.AsInt64() requestBytes, ok := size.AsInt64()
if !ok { if !ok {
return 0, fmt.Errorf("quantity %v is too great, overflows int64", size) return 0, fmt.Errorf("quantity %s is too great, overflows int64", size.String())
} }
return roundUpSizeInt32(requestBytes, GiB) return roundUpSizeInt32(requestBytes, GiB)
} }