Skip to content

Modern Docker Management, Designed for Everyone

perf(updater): remove N+1 project service calls in used-image collection (#1811)

Kyle Mendell5a250ff7b752
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index 62bc05f64..b02e06b7e 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -10,6 +10,7 @@ import (
"strings"
"time"
+ "github.com/compose-spec/compose-go/v2/loader"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
@@ -20,6 +21,7 @@ import (
"github.com/getarcaneapp/arcane/backend/internal/models"
"github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater"
arcRegistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry"
+ projectspkg "github.com/getarcaneapp/arcane/backend/pkg/projects"
"github.com/getarcaneapp/arcane/types/updater"
)
@@ -905,28 +907,61 @@ func (s *UpdaterService) collectUsedImagesFromProjects(ctx context.Context, out
return err
}
- for _, p := range projs {
+ activeProjectNames := activeComposeProjectNameSetInternal(projs)
+ if len(activeProjectNames) == 0 {
+ return nil
+ }
+
+ composeContainers, err := projectspkg.ListGlobalComposeContainers(ctx)
+ if err != nil {
+ return err
+ }
+
+ s.collectUsedImagesFromComposeContainersInternal(composeContainers, activeProjectNames, out)
+ return nil
+}
+
+func activeComposeProjectNameSetInternal(projects []models.Project) map[string]struct{} {
+ active := make(map[string]struct{})
+ for _, p := range projects {
// consider running and partially running projects
if p.Status != models.ProjectStatusRunning && p.Status != models.ProjectStatusPartiallyRunning {
continue
}
- services, serr := s.projectService.GetProjectServices(ctx, p.ID)
- if serr != nil {
+ name := strings.TrimSpace(p.Name)
+ if name == "" {
continue
}
- for _, svc := range services {
- if svc.ServiceConfig != nil && arcaneupdater.IsUpdateDisabled(svc.ServiceConfig.Labels) {
- continue
- }
- img := strings.TrimSpace(svc.Image)
- if img == "" {
- continue
- }
- out[s.normalizeRef(img)] = struct{}{}
+
+ active[name] = struct{}{}
+
+ if normalized := loader.NormalizeProjectName(name); normalized != "" {
+ active[normalized] = struct{}{}
}
}
- return nil
+ return active
+}
+
+func (s *UpdaterService) collectUsedImagesFromComposeContainersInternal(composeContainers []container.Summary, activeProjectNames map[string]struct{}, out map[string]struct{}) {
+ for _, c := range composeContainers {
+ projectName := strings.TrimSpace(c.Labels["com.docker.compose.project"])
+ if projectName == "" {
+ continue
+ }
+ if _, isActive := activeProjectNames[projectName]; !isActive {
+ continue
+ }
+ if arcaneupdater.IsUpdateDisabled(c.Labels) {
+ continue
+ }
+
+ imageRef := strings.TrimSpace(c.Image)
+ if imageRef == "" || isImageIDLikeReferenceInternal(imageRef) {
+ continue
+ }
+ out[s.normalizeRef(imageRef)] = struct{}{}
+ }
}
func (s *UpdaterService) getNormalizedTagsForContainer(ctx context.Context, dcli *client.Client, inspect container.InspectResponse) []string {
diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.go
index 54efde2eb..c25b4b7cf 100644
--- a/backend/internal/services/updater_service_test.go
+++ b/backend/internal/services/updater_service_test.go
@@ -361,3 +361,62 @@ func TestUpdaterService_ApplyPending_SkipsWhenUsedImageDiscoveryFails(t *testing
require.NoError(t, db.WithContext(ctx).Where("id = ?", record.ID).First(&persisted).Error)
assert.True(t, persisted.HasUpdate, "record should remain pending when used-image discovery fails")
}
+
+func TestActiveComposeProjectNameSetInternal(t *testing.T) {
+ projects := []models.Project{
+ {Name: "My-App", Status: models.ProjectStatusRunning},
+ {Name: "skip-me", Status: models.ProjectStatusStopped},
+ {Name: "another_app", Status: models.ProjectStatusPartiallyRunning},
+ {Name: "", Status: models.ProjectStatusRunning},
+ }
+
+ got := activeComposeProjectNameSetInternal(projects)
+
+ assert.Contains(t, got, "My-App")
+ assert.Contains(t, got, "my-app")
+ assert.Contains(t, got, "another_app")
+ assert.NotContains(t, got, "skip-me")
+}
+
+func TestCollectUsedImagesFromComposeContainersInternal(t *testing.T) {
+ svc := &UpdaterService{}
+ out := map[string]struct{}{}
+ activeProjects := map[string]struct{}{
+ "myapp": {},
+ }
+
+ composeContainers := []container.Summary{
+ {
+ Image: "nginx:latest",
+ Labels: map[string]string{
+ "com.docker.compose.project": "myapp",
+ },
+ },
+ {
+ Image: "redis:7",
+ Labels: map[string]string{
+ "com.docker.compose.project": "myapp",
+ arcaneupdater.LabelUpdater: "false",
+ },
+ },
+ {
+ Image: "postgres:16",
+ Labels: map[string]string{
+ "com.docker.compose.project": "otherapp",
+ },
+ },
+ {
+ Image: "sha256:abcdef",
+ Labels: map[string]string{
+ "com.docker.compose.project": "myapp",
+ },
+ },
+ }
+
+ svc.collectUsedImagesFromComposeContainersInternal(composeContainers, activeProjects, out)
+
+ assert.Contains(t, out, svc.normalizeRef("nginx:latest"))
+ assert.NotContains(t, out, svc.normalizeRef("redis:7"))
+ assert.NotContains(t, out, svc.normalizeRef("postgres:16"))
+ assert.NotContains(t, out, svc.normalizeRef("sha256:abcdef"))
+}