gluster/glusterd2
1
0
Fork 0
mirror of https://github.com/gluster/glusterd2.git synced 2026-02-05 12:45:38 +01:00
Code Issues Releases Activity

Fix the Volume Capacity display in CLI

Browse Source 
Earlier `humanReadable` function was accepting values in `MiB`
With PR #1326 default unit is changed to bytes.

Signed-off-by: Aravinda VK <avishwan@redhat.com>
This commit is contained in:
Aravinda VK
2018-11-23 18:23:46 +05:30
committed by Madhu Rajanna
parent 65dafcd708
commit 419ae7dff5
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
glustercli/cmd/utils.go
View File

@@ -66,33 +66,29 @@ func sizeToBytes(value string) (uint64, error) {
return size, nil
}
// logn is used to find the unit size the given MB belongs to.
// 1024 MB will return 1
// 1048576 MB will return 2 and so on
// logn is used to find the unit size the given bytes belongs to.
// 1024 will return 1
// 1048576 will return 2 and so on
func logn(n, b float64) float64 {
return math.Log(n) / math.Log(b)
}
// humanReadable converts size given in MB into a more human readable unit
// humanReadable converts size given in bytes into a more human readable unit
//
// humanReadable(1024) returns 1.0 GB
// humanReadable(1536) returns 1.5 GB
// humanReadable(1048576) returns 1.0 TB
// humanReadable(1024) returns 1.0 KiB
// humanReadable(1536) returns 1.5 KiB
// humanReadable(1048576) returns 1.0 MiB
func humanReadable(value uint64) string {
units := []string{"MB", "GB", "TB", "PB", "EB"}
// If less than 1024MB we return it as such
units := []string{"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"}
// If less than 1024 we return it as such
if value < 1024 {
return fmt.Sprintf("%.1f MB", float64(value))
return fmt.Sprintf("%.1f B", float64(value))
}
e := math.Floor(logn(float64(value), 1024))
suffix := units[int(e)]
size := math.Floor(float64(value)/math.Pow(1024, e)*10+0.5) / 10
f := "%.0f %s"
if size < 10 {
f = "%.1f %s"
}
return fmt.Sprintf(f, size, suffix)
return fmt.Sprintf("%.1f %s", size, suffix)
}
func readString(prompt string, args ...interface{}) string {

18
glustercli/cmd/utils_test.go
View File

@@ -3,14 +3,22 @@ package cmd
import (
"testing"
gutils "github.com/gluster/glusterd2/pkg/utils"
"github.com/stretchr/testify/assert"
)
// TestHumanReadable checks if the function returns the right size with unit
// for the input given in MB
// for the input given in bytes
func TestHumanReadable(t *testing.T) {
assert.Equal(t, "20.0 MB", humanReadable(20))
assert.Equal(t, "1.0 GB", humanReadable(1024))
assert.Equal(t, "1.5 GB", humanReadable(1536))
assert.Equal(t, "1.0 TB", humanReadable(1048576))
assert.Equal(t, "900.0 B", humanReadable(900))
assert.Equal(t, "1.0 KiB", humanReadable(1024))
assert.Equal(t, "1.5 KiB", humanReadable(1536))
assert.Equal(t, "1.0 MiB", humanReadable(1*gutils.MiB))
assert.Equal(t, "1.5 MiB", humanReadable(1.5*gutils.MiB))
assert.Equal(t, "20.0 KiB", humanReadable(20*gutils.KiB))
assert.Equal(t, "20.0 MiB", humanReadable(20*gutils.MiB))
assert.Equal(t, "1.0 GiB", humanReadable(1*gutils.GiB))
assert.Equal(t, "1.5 GiB", humanReadable(1536*gutils.MiB))
assert.Equal(t, "1.0 TiB", humanReadable(1*gutils.TiB))
}