Skip to content

Modern Docker Management, Designed for Everyone

perf(volume-service): replace nested usage enrichment loop with map lookup (#1815)

Kyle Mendell68aeb11aa802
diff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.go
index ebbe57d7c..34ca4f5e9 100644
--- a/backend/internal/services/volume_service.go
+++ b/backend/internal/services/volume_service.go
@@ -1597,14 +1597,22 @@ func (s *VolumeService) GetVolumeSizes(ctx context.Context) (map[string]VolumeSi
func (s *VolumeService) enrichVolumesWithUsageDataInternal(volumes []*volume.Volume, usageVolumes []volume.Volume) []volume.Volume {
slog.Debug("volume service: enrich volumes with usage data", "volumes", len(volumes), "usage_volumes", len(usageVolumes))
+ usageByName := make(map[string]*volume.UsageData, len(usageVolumes))
+ for _, uv := range usageVolumes {
+ if uv.Name == "" || uv.UsageData == nil {
+ continue
+ }
+ // Keep first-seen value to preserve previous nested-loop behavior.
+ if _, exists := usageByName[uv.Name]; !exists {
+ usageByName[uv.Name] = uv.UsageData
+ }
+ }
+
result := make([]volume.Volume, 0, len(volumes))
for _, v := range volumes {
if v != nil {
- for _, uv := range usageVolumes {
- if uv.Name == v.Name && uv.UsageData != nil {
- v.UsageData = uv.UsageData
- break
- }
+ if usageData, exists := usageByName[v.Name]; exists {
+ v.UsageData = usageData
}
result = append(result, *v)
diff --git a/backend/internal/services/volume_service_test.go b/backend/internal/services/volume_service_test.go
index 72cad7e8d..fd429a7b1 100644
--- a/backend/internal/services/volume_service_test.go
+++ b/backend/internal/services/volume_service_test.go
@@ -4,6 +4,7 @@ import (
"testing"
"github.com/docker/docker/api/types/container"
+ "github.com/docker/docker/api/types/volume"
"github.com/getarcaneapp/arcane/backend/pkg/libarcane"
"github.com/stretchr/testify/require"
)
@@ -55,3 +56,59 @@ func TestBuildVolumeHelperLabelsInternal(t *testing.T) {
require.Equal(t, "true", labels[libarcane.InternalResourceLabel])
require.Len(t, labels, 1)
}
+
+func TestEnrichVolumesWithUsageDataInternal(t *testing.T) {
+ svc := &VolumeService{}
+
+ tests := []struct {
+ name string
+ volumes []*volume.Volume
+ usageVolumes []volume.Volume
+ wantLen int
+ assertions func(t *testing.T, got []volume.Volume)
+ }{
+ {
+ name: "attaches usage by name and skips nil volumes",
+ volumes: []*volume.Volume{
+ {Name: "vol-a"},
+ nil,
+ {Name: "vol-b"},
+ },
+ usageVolumes: []volume.Volume{
+ {Name: "vol-a", UsageData: &volume.UsageData{Size: 100, RefCount: 2}},
+ {Name: "vol-c", UsageData: &volume.UsageData{Size: 50, RefCount: 1}},
+ },
+ wantLen: 2,
+ assertions: func(t *testing.T, got []volume.Volume) {
+ require.NotNil(t, got[0].UsageData)
+ require.EqualValues(t, 100, got[0].UsageData.Size)
+ require.EqualValues(t, 2, got[0].UsageData.RefCount)
+ require.Nil(t, got[1].UsageData)
+ },
+ },
+ {
+ name: "keeps first usage entry when duplicate usage names exist",
+ volumes: []*volume.Volume{
+ {Name: "vol-dup"},
+ },
+ usageVolumes: []volume.Volume{
+ {Name: "vol-dup", UsageData: &volume.UsageData{Size: 10, RefCount: 1}},
+ {Name: "vol-dup", UsageData: &volume.UsageData{Size: 20, RefCount: 3}},
+ },
+ wantLen: 1,
+ assertions: func(t *testing.T, got []volume.Volume) {
+ require.NotNil(t, got[0].UsageData)
+ require.EqualValues(t, 10, got[0].UsageData.Size)
+ require.EqualValues(t, 1, got[0].UsageData.RefCount)
+ },
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got := svc.enrichVolumesWithUsageDataInternal(tt.volumes, tt.usageVolumes)
+ require.Len(t, got, tt.wantLen)
+ tt.assertions(t, got)
+ })
+ }
+}