opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13575 from Luap99/percent

Browse Source 
podman system df: fix percent calculation
This commit is contained in:
OpenShift Merge Robot
2022-03-21 15:04:46 +01:00
committed by GitHub
parent 4282f56533 e3cc0717b2
commit e034db16bf
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/system/df.go
View File

@ -2,6 +2,7 @@ package system
import ( import (
"fmt" "fmt"
"math"
"os" "os"
"strings" "strings"
"time" "time"
@ -288,6 +289,10 @@ func (d *dfSummary) Size() string {
} }
func (d *dfSummary) Reclaimable() string { func (d *dfSummary) Reclaimable() string {
percent := int(float64(d.reclaimable)/float64(d.size)) * 100 percent := 0
// make sure to check this to prevent div by zero problems
if d.size > 0 {
percent = int(math.Round(float64(d.reclaimable) / float64(d.size) * float64(100)))
}
return fmt.Sprintf("%s (%d%%)", units.HumanSize(float64(d.reclaimable)), percent) return fmt.Sprintf("%s (%d%%)", units.HumanSize(float64(d.reclaimable)), percent)
} }

17
test/e2e/system_df_test.go
View File

@ -41,11 +41,17 @@ var _ = Describe("podman system df", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"volume", "create", "data"}) // run two containers with volumes to create something in the volume
session = podmanTest.Podman([]string{"run", "-v", "data1:/data", "--name", "container1", BB, "sh", "-c", "echo test > /data/1"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"create", "-v", "data:/data", "--name", "container1", BB}) session = podmanTest.Podman([]string{"run", "-v", "data2:/data", "--name", "container2", BB, "sh", "-c", "echo test > /data/1"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
// remove one container, we keep the volume
session = podmanTest.Podman([]string{"rm", "container2"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
@ -61,9 +67,10 @@ var _ = Describe("podman system df", func() {
images := strings.Fields(session.OutputToStringArray()[1]) images := strings.Fields(session.OutputToStringArray()[1])
containers := strings.Fields(session.OutputToStringArray()[2]) containers := strings.Fields(session.OutputToStringArray()[2])
volumes := strings.Fields(session.OutputToStringArray()[3]) volumes := strings.Fields(session.OutputToStringArray()[3])
Expect(images[1]).To(Equal(string(totImages))) Expect(images[1]).To(Equal(string(totImages)), "total images expected")
Expect(containers[1]).To(Equal("2")) Expect(containers[1]).To(Equal("2"), "total containers expected")
Expect(volumes[2]).To(Equal("1")) Expect(volumes[2]).To(Equal("2"), "total volumes expected")
Expect(volumes[6]).To(Equal("(50%)"), "percentage usage expected")
}) })
It("podman system df image with no tag", func() { It("podman system df image with no tag", func() {