E58C api/types/volume: move `DiskUsage` type internal to daemon backend · moby/moby@c4e82ba · GitHub
[go: up one dir, main page]
Skip to content

Commit c4e82ba

Browse files
austinvazquezaustinvazquez
committed
api/types/volume: move DiskUsage type internal to daemon backend
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
1 parent 0d61b55 commit c4e82ba

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

‎api/types/volume/disk_usage.go‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎daemon/daemon.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
networktypes "github.com/moby/moby/api/types/network"
3939
registrytypes "github.com/moby/moby/api/types/registry"
4040
"github.com/moby/moby/api/types/swarm"
41-
volumetypes "github.com/moby/moby/api/types/volume"
4241
"github.com/moby/sys/user"
4342
"github.com/moby/sys/userns"
4443
"github.com/pkg/errors"
@@ -136,7 +135,7 @@ type Daemon struct {
136135

137136
usageContainers singleflight.Group[struct{}, *backend.ContainerDiskUsage]
138137
usageImages singleflight.Group[struct{}, []*imagetypes.Summary]
139-
usageVolumes singleflight.Group[struct{}, *volumetypes.DiskUsage]
138+
usageVolumes singleflight.Group[struct{}, *backend.VolumeDiskUsage]
140139
usageLayer singleflight.Group[struct{}, int64]
141140

142141
pruneRunning atomic.Bool

‎daemon/disk_usage.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/moby/moby/api/types/container"
88
"github.com/moby/moby/api/types/filters"
99
"github.com/moby/moby/api/types/image"
10-
"github.com/moby/moby/api/types/volume"
1110
"github.com/moby/moby/v2/daemon/server/backend"
1211
"github.com/pkg/errors"
1312
"golang.org/x/sync/errgroup"
@@ -70,14 +69,14 @@ func (daemon *Daemon) imageDiskUsage(ctx context.Context) ([]*image.Summary, err
7069

7170
// localVolumesSize obtains information about volume disk usage from volumes service
7271
// and makes sure that only one size calculation is performed at the same time.
73-
func (daemon *Daemon) localVolumesSize(ctx context.Context) (*volume.DiskUsage, error) {
74-
volumes, _, err := daemon.usageVolumes.Do(ctx, struct{}{}, func(ctx context.Context) (*volume.DiskUsage, error) {
72+
func (daemon *Daemon) localVolumesSize(ctx context.Context) (*backend.VolumeDiskUsage, error) {
73+
volumes, _, err := daemon.usageVolumes.Do(ctx, struct{}{}, func(ctx context.Context) (*backend.VolumeDiskUsage, error) {
7574
volumes, err := daemon.volumes.LocalVolumesSize(ctx)
7675
if err != nil {
7776
return nil, err
7877
}
7978

80-
du := &volume.DiskUsage{Items: volumes}
79+
du := &backend.VolumeDiskUsage{Items: volumes}
8180
for _, v := range du.Items {
8281
if v.UsageData.Size != -1 {
8382
if v.UsageData.RefCount == 0 {

‎daemon/server/backend/disk_usage.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type DiskUsageOptions struct {
2424
type DiskUsage struct {
2525
Images *ImageDiskUsage
2626
Containers *ContainerDiskUsage
27-
Volumes *volume.DiskUsage
27+
Volumes *VolumeDiskUsage
2828
BuildCache *BuildCacheDiskUsage
2929
}
3030

@@ -48,3 +48,10 @@ type ImageDiskUsage struct {
4848
Reclaimable int64
4949
Items []*image.Summary
5050
}
51+
52+
// VolumeDiskUsage contains disk usage for volumes.
53+
type VolumeDiskUsage struct {
54+
TotalSize int64
55+
Reclaimable int64
56+
Items []*volume.Volume
57+
}

‎vendor/github.com/moby/moby/api/types/volume/disk_usage.go‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0