diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-09-04 11:08:45 -0400 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2020-09-04 11:11:39 -0400 |
| commit | f6a988547be825ad78d9fe106181eafbc3ddf20c (patch) | |
| tree | d2d1dae4938c748c135b9ff70350a5fb2e7561e8 /cmd/podman/system | |
| parent | fa487a65220951e84779f200f48780666b4b9209 (diff) | |
| download | podman-f6a988547be825ad78d9fe106181eafbc3ddf20c.tar.gz podman-f6a988547be825ad78d9fe106181eafbc3ddf20c.tar.bz2 podman-f6a988547be825ad78d9fe106181eafbc3ddf20c.zip | |
Fix system df inconsistent
Use RWSzir as system df verbose containers size to remain consistent with the summery. Volume is reclaimable only if not used by container.
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'cmd/podman/system')
| -rw-r--r-- | cmd/podman/system/df.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index 03991101e..b262c8478 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -134,7 +134,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error { for _, v := range reports.Volumes { activeVolumes += v.Links volumesSize += v.Size - volumesReclaimable += v.Size + volumesReclaimable += v.ReclaimableSize } volumeSummary := dfSummary{ Type: "Local Volumes", @@ -182,7 +182,7 @@ func printVerbose(reports *entities.SystemDfReport) error { dfContainers = append(dfContainers, &dfContainer{SystemDfContainerReport: d}) } containerHeaders := "CONTAINER ID\tIMAGE\tCOMMAND\tLOCAL VOLUMES\tSIZE\tCREATED\tSTATUS\tNAMES\n" - containerRow := "{{.ContainerID}}\t{{.Image}}\t{{.Command}}\t{{.LocalVolumes}}\t{{.Size}}\t{{.Created}}\t{{.Status}}\t{{.Names}}\n" + containerRow := "{{.ContainerID}}\t{{.Image}}\t{{.Command}}\t{{.LocalVolumes}}\t{{.RWSize}}\t{{.Created}}\t{{.Status}}\t{{.Names}}\n" format = containerHeaders + "{{range . }}" + containerRow + "{{end}}" if err := writeTemplate(w, format, dfContainers); err != nil { return nil @@ -257,8 +257,8 @@ func (d *dfContainer) Command() string { return strings.Join(d.SystemDfContainerReport.Command, " ") } -func (d *dfContainer) Size() string { - return units.HumanSize(float64(d.SystemDfContainerReport.Size)) +func (d *dfContainer) RWSize() string { + return units.HumanSize(float64(d.SystemDfContainerReport.RWSize)) } func (d *dfContainer) Created() string { |