Merge pull request #7540 from QiWang19/system-df

Fix system df inconsistent

2 files changed, 12 insertions, 6 deletions

diff --git a/pkg/domain/entities/system.go b/pkg/domain/entities/system.go
index af355b0af..bde2b6ef2 100644
--- a/pkg/domain/entities/system.go
+++ b/pkg/domain/entities/system.go
@@ -75,9 +75,10 @@ type SystemDfContainerReport struct {
 
 // SystemDfVolumeReport describes a volume and its size
 type SystemDfVolumeReport struct {
-	VolumeName string
-	Links      int
-	Size       int64
+	VolumeName      string
+	Links           int
+	Size            int64
+	ReclaimableSize int64
 }
 
 // SystemResetOptions describes the options for resetting your
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index ff1052d86..914a7681d 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -313,6 +313,7 @@ func (ic *ContainerEngine) SystemDf(ctx context.Context, options entities.System
 	}
 
 	dfVolumes := make([]*entities.SystemDfVolumeReport, 0, len(vols))
+	var reclaimableSize int64
 	for _, v := range vols {
 		var consInUse int
 		volSize, err := sizeOfPath(v.MountPoint())
@@ -323,15 +324,19 @@ func (ic *ContainerEngine) SystemDf(ctx context.Context, options entities.System
 		if err != nil {
 			return nil, err
 		}
+		if len(inUse) == 0 {
+			reclaimableSize += volSize
+		}
 		for _, viu := range inUse {
 			if util.StringInSlice(viu, runningContainers) {
 				consInUse++
 			}
 		}
 		report := entities.SystemDfVolumeReport{
-			VolumeName: v.Name(),
-			Links:      consInUse,
-			Size:       volSize,
+			VolumeName:      v.Name(),
+			Links:           consInUse,
+			Size:            volSize,
+			ReclaimableSize: reclaimableSize,
 		}
 		dfVolumes = append(dfVolumes, &report)
 	}