diff --git a/internal/app/wwctl/container/list/main.go b/internal/app/wwctl/container/list/main.go index ea2d48f4..1b194085 100644 --- a/internal/app/wwctl/container/list/main.go +++ b/internal/app/wwctl/container/list/main.go @@ -5,6 +5,7 @@ import ( "time" "github.com/hpcng/warewulf/internal/pkg/api/container" + "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/spf13/cobra" ) @@ -17,16 +18,17 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { return } - fmt.Printf("%-16s %-6s %-16s %-18s %-18s\n", "CONTAINER NAME", "NODES", "KERNEL VERSION", "CREATION TIME", "MODIFICATION TIME") + fmt.Printf("%-16s %-6s %-16s %-20s %-20s %-8s\n", "CONTAINER NAME", "NODES", "KERNEL VERSION", "CREATION TIME", "MODIFICATION TIME", "SIZE") for i := 0; i < len(containerInfo); i++ { createTime := time.Unix(int64(containerInfo[i].CreateDate), 0) modTime := time.Unix(int64(containerInfo[i].ModDate), 0) - fmt.Printf("%-16s %-6d %-16s %-18s %-18s\n", + fmt.Printf("%-16s %-6d %-16s %-20s %-20s %-8s\n", containerInfo[i].Name, containerInfo[i].NodeCount, containerInfo[i].KernelVersion, createTime.Format(time.RFC822), - modTime.Format(time.RFC822)) + modTime.Format(time.RFC822), + util.ByteToString(int64(containerInfo[i].Size))) } return } diff --git a/internal/pkg/api/container/container.go b/internal/pkg/api/container/container.go index 8e56772c..401a5cb2 100644 --- a/internal/pkg/api/container/container.go +++ b/internal/pkg/api/container/container.go @@ -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), }) } diff --git a/internal/pkg/util/util.go b/internal/pkg/util/util.go index 05ebfe0d..f8b7f3f4 100644 --- a/internal/pkg/util/util.go +++ b/internal/pkg/util/util.go @@ -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]) +}