added size of containers
This commit is contained in:
@@ -298,12 +298,28 @@ func ContainerList() (containerInfo []*wwapiv1.ContainerInfo, err error) {
|
||||
if err != nil {
|
||||
wwlog.Error("%s\n", err)
|
||||
}
|
||||
size, err := util.DirSize(container.SourceDir(source))
|
||||
if err != nil {
|
||||
wwlog.Error("%s\n", err)
|
||||
}
|
||||
imgSize, err := os.Stat(container.ImageFile(source))
|
||||
if err != nil {
|
||||
wwlog.Error("%s\n", err)
|
||||
}
|
||||
size += imgSize.Size()
|
||||
imgSize, err = os.Stat(container.ImageFile(source) + ".gz")
|
||||
if err != nil {
|
||||
wwlog.Error("%s\n", err)
|
||||
}
|
||||
size += imgSize.Size()
|
||||
|
||||
containerInfo = append(containerInfo, &wwapiv1.ContainerInfo{
|
||||
Name: source,
|
||||
NodeCount: uint32(nodemap[source]),
|
||||
KernelVersion: kernelVersion,
|
||||
CreateDate: uint64(creationTime.ModTime().Unix()),
|
||||
ModDate: uint64(modTime.ModTime().Unix()),
|
||||
Size: uint64(size),
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@@ -715,3 +715,36 @@ func RunWWCTL(args ...string) (out []byte, err error) {
|
||||
|
||||
return out, err
|
||||
}
|
||||
|
||||
/*
|
||||
Get size of given directory in bytes
|
||||
*/
|
||||
func DirSize(path string) (int64, error) {
|
||||
var size int64
|
||||
err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !info.IsDir() {
|
||||
size += info.Size()
|
||||
}
|
||||
return err
|
||||
})
|
||||
return size, err
|
||||
}
|
||||
|
||||
/*
|
||||
Convert bytes to human friendly format
|
||||
*/
|
||||
func ByteToString(b int64) string {
|
||||
const base = 1024
|
||||
if b < base {
|
||||
return fmt.Sprintf("%d B", b)
|
||||
}
|
||||
div, exp := int64(base), 0
|
||||
for n := b / base; n >= base; n /= base {
|
||||
div *= base
|
||||
exp++
|
||||
}
|
||||
return fmt.Sprintf("%.1f %ciB", float64(b)/float64(div), "KMGTPE"[exp])
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user