Skip to content

Modern Docker Management, Designed for Everyone

fix(updater): clear update records by image ID and fail closed on used-image discovery errors (#1810)

Kyle Mendellf9b9a247621b
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index 1278d87a1..62bc05f64 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -2,6 +2,7 @@ package services
import (
"context"
+ "errors"
"fmt"
"io"
"log/slog"
@@ -86,8 +87,14 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, dryRun bool) (*update
// Only update images that are actually used by running resources
usedImages, err := s.collectUsedImages(ctx)
if err != nil {
- // Non-fatal: continue without the filter
- usedImages = map[string]struct{}{}
+ slog.WarnContext(ctx, "ApplyPending: failed to collect actively used images; skipping update run", "error", err)
+ out.Duration = time.Since(start).String()
+ return out, nil
+ }
+ if len(usedImages) == 0 {
+ slog.DebugContext(ctx, "ApplyPending: no actively used images found; nothing to update")
+ out.Duration = time.Since(start).String()
+ return out, nil
}
// Plan updates and capture OLD image digests before pull
@@ -106,10 +113,8 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, dryRun bool) (*update
oldRef := fmt.Sprintf("%s:%s", r.Repository, r.Tag)
oldNorm := s.normalizeRef(oldRef)
- if len(usedImages) > 0 {
- if _, ok := usedImages[oldNorm]; !ok {
- continue
- }
+ if _, ok := usedImages[oldNorm]; !ok {
+ continue
}
newRef := oldRef
@@ -852,17 +857,39 @@ func isImageIDLikeReferenceInternal(ref string) bool {
// Aggregate images in use across containers and compose projects
func (s *UpdaterService) collectUsedImages(ctx context.Context) (map[string]struct{}, error) {
out := map[string]struct{}{}
+ var errs []error
+ successfulSources := 0
- dcli, err := s.dockerService.GetClient()
- if err == nil && dcli != nil {
-
- slog.DebugContext(ctx, "collectUsedImages: docker connection created")
+ if s.dockerService == nil {
+ errs = append(errs, errors.New("docker service unavailable"))
} else {
- slog.DebugContext(ctx, "collectUsedImages: docker connection not available, continuing without container list", "err", err)
+ dcli, err := s.dockerService.GetClient()
+ if err != nil || dcli == nil {
+ if err == nil {
+ err = errors.New("docker client unavailable")
+ }
+ errs = append(errs, fmt.Errorf("docker client: %w", err))
+ slog.DebugContext(ctx, "collectUsedImages: docker connection unavailable", "err", err)
+ } else if err := s.collectUsedImagesFromContainersInternal(ctx, dcli, out); err != nil {
+ errs = append(errs, fmt.Errorf("containers source: %w", err))
+ slog.DebugContext(ctx, "collectUsedImages: failed collecting from containers", "err", err)
+ } else {
+ successfulSources++
+ }
}
- _ = s.collectUsedImagesFromContainersInternal(ctx, dcli, out)
- _ = s.collectUsedImagesFromProjects(ctx, out)
+ if s.projectService != nil {
+ if err := s.collectUsedImagesFromProjects(ctx, out); err != nil {
+ errs = append(errs, fmt.Errorf("projects source: %w", err))
+ slog.DebugContext(ctx, "collectUsedImages: failed collecting from projects", "err", err)
+ } else {
+ successfulSources++
+ }
+ }
+
+ if successfulSources == 0 {
+ return nil, errors.Join(errs...)
+ }
slog.DebugContext(ctx, "collectUsedImages: collected used images", "count", len(out))
return out, nil
diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.go
index 2f7aeba0f..54efde2eb 100644
--- a/backend/internal/services/updater_service_test.go
+++ b/backend/internal/services/updater_service_test.go
@@ -7,6 +7,7 @@ import (
"time"
"github.com/docker/docker/api/types/container"
+ "github.com/getarcaneapp/arcane/backend/internal/config"
"github.com/getarcaneapp/arcane/backend/internal/database"
glsqlite "github.com/glebarez/sqlite"
"github.com/stretchr/testify/assert"
@@ -317,3 +318,46 @@ func TestUpdaterService_ClearImageUpdateRecordByID_AvoidsRepoCanonicalMismatch(t
require.NoError(t, db.WithContext(ctx).Where("id = ?", record.ID).First(&cleared).Error)
assert.False(t, cleared.HasUpdate, "clear by image ID should always match the intended record")
}
+
+func TestUpdaterService_CollectUsedImages_NoSourcesReturnsError(t *testing.T) {
+ svc := &UpdaterService{}
+
+ used, err := svc.collectUsedImages(context.Background())
+ require.Error(t, err)
+ assert.Nil(t, used)
+}
+
+func TestUpdaterService_ApplyPending_SkipsWhenUsedImageDiscoveryFails(t *testing.T) {
+ ctx := context.Background()
+ db := setupUpdaterServiceTestDB(t)
+
+ record := models.ImageUpdateRecord{
+ ID: "sha256:pending-image",
+ Repository: "nginx",
+ Tag: "latest",
+ HasUpdate: true,
+ UpdateType: models.UpdateTypeDigest,
+ CurrentVersion: "latest",
+ CheckTime: time.Now(),
+ }
+ require.NoError(t, db.WithContext(ctx).Create(&record).Error)
+
+ svc := &UpdaterService{
+ db: db,
+ dockerService: &DockerClientService{
+ config: &config.Config{DockerHost: "://bad-host"},
+ },
+ }
+
+ out, err := svc.ApplyPending(ctx, false)
+ require.NoError(t, err)
+ require.NotNil(t, out)
+ assert.Empty(t, out.Items)
+ assert.Zero(t, out.Checked)
+ assert.Zero(t, out.Updated)
+ assert.NotEmpty(t, out.Duration)
+
+ var persisted models.ImageUpdateRecord
+ 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")
+}
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index 428d4d314..c4876e13a 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -1898,10 +1898,7 @@ func buildTrivyCPUSetInternal(nanoCPUs int64, hostCPUs int) string {
hostCPUs = 1
}
- requestedCPUs := max(int(math.Floor(float64(nanoCPUs)/float64(trivyNanoCPUsPerCore))), 1)
- if requestedCPUs > hostCPUs {
- requestedCPUs = hostCPUs
- }
+ requestedCPUs := min(max(int(math.Floor(float64(nanoCPUs)/float64(trivyNanoCPUsPerCore))), 1), hostCPUs)
if requestedCPUs == 1 {
return "0"