refactor: CR's fixes

evgeniy-scherbina · evgeniy-scherbina · commit 0fdd096951a7 · 2025-05-12T19:26:37.000Z
diff --git a/coderd/prebuilds/global_snapshot.go b/coderd/prebuilds/global_snapshot.go
@@ -10,11 +10,11 @@ import (
 
 // GlobalSnapshot represents a full point-in-time snapshot of state relating to prebuilds across all templates.
 type GlobalSnapshot struct {
-	Presets              []database.GetTemplatePresetsWithPrebuildsRow
-	RunningPrebuilds     []database.GetRunningPrebuiltWorkspacesRow
-	PrebuildsInProgress  []database.CountInProgressPrebuildsRow
-	Backoffs             []database.GetPresetsBackoffRow
-	HardLimitedPresetMap map[uuid.UUID]database.GetPresetsAtFailureLimitRow
+	Presets             []database.GetTemplatePresetsWithPrebuildsRow
+	RunningPrebuilds    []database.GetRunningPrebuiltWorkspacesRow
+	PrebuildsInProgress []database.CountInProgressPrebuildsRow
+	Backoffs            []database.GetPresetsBackoffRow
+	HardLimitedPresets  []database.GetPresetsAtFailureLimitRow
 }
 
 func NewGlobalSnapshot(
@@ -24,17 +24,12 @@ func NewGlobalSnapshot(
 	backoffs []database.GetPresetsBackoffRow,
 	hardLimitedPresets []database.GetPresetsAtFailureLimitRow,
 ) GlobalSnapshot {
-	hardLimitedPresetMap := make(map[uuid.UUID]database.GetPresetsAtFailureLimitRow, len(hardLimitedPresets))
-	for _, preset := range hardLimitedPresets {
-		hardLimitedPresetMap[preset.PresetID] = preset
-	}
-
 	return GlobalSnapshot{
-		Presets:              presets,
-		RunningPrebuilds:     runningPrebuilds,
-		PrebuildsInProgress:  prebuildsInProgress,
-		Backoffs:             backoffs,
-		HardLimitedPresetMap: hardLimitedPresetMap,
+		Presets:             presets,
+		RunningPrebuilds:    runningPrebuilds,
+		PrebuildsInProgress: prebuildsInProgress,
+		Backoffs:            backoffs,
+		HardLimitedPresets:  hardLimitedPresets,
 	}
 }
 
@@ -65,15 +60,15 @@ func (s GlobalSnapshot) FilterByPreset(presetID uuid.UUID) (*PresetSnapshot, err
 		backoffPtr = &backoff
 	}
 
+	_, isHardLimited := slice.Find(s.HardLimitedPresets, func(row database.GetPresetsAtFailureLimitRow) bool {
+		return row.PresetID == preset.ID
+	})
+
 	return &PresetSnapshot{
-		Preset:     preset,
-		Running:    running,
-		InProgress: inProgress,
-		Backoff:    backoffPtr,
+		Preset:        preset,
+		Running:       running,
+		InProgress:    inProgress,
+		Backoff:       backoffPtr,
+		IsHardLimited: isHardLimited,
 	}, nil
 }
-
-func (s GlobalSnapshot) IsHardLimited(presetID uuid.UUID) bool {
-	_, ok := s.HardLimitedPresetMap[presetID]
-	return ok
-}
diff --git a/coderd/prebuilds/preset_snapshot.go b/coderd/prebuilds/preset_snapshot.go
@@ -32,10 +32,11 @@ const (
 // It contains the raw data needed to calculate the current state of a preset's prebuilds,
 // including running prebuilds, in-progress builds, and backoff information.
 type PresetSnapshot struct {
-	Preset     database.GetTemplatePresetsWithPrebuildsRow
-	Running    []database.GetRunningPrebuiltWorkspacesRow
-	InProgress []database.CountInProgressPrebuildsRow
-	Backoff    *database.GetPresetsBackoffRow
+	Preset        database.GetTemplatePresetsWithPrebuildsRow
+	Running       []database.GetRunningPrebuiltWorkspacesRow
+	InProgress    []database.CountInProgressPrebuildsRow
+	Backoff       *database.GetPresetsBackoffRow
+	IsHardLimited bool
 }
 
 // ReconciliationState represents the processed state of a preset's prebuilds,
diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -243,11 +243,6 @@ func (c *StoreReconciler) ReconcileAll(ctx context.Context) error {
 		var eg errgroup.Group
 		// Reconcile presets in parallel. Each preset in its own goroutine.
 		for _, preset := range snapshot.Presets {
-			if snapshot.IsHardLimited(preset.ID) {
-				logger.Debug(ctx, "skipping hard limited preset", slog.F("preset_id", preset.ID), slog.F("name", preset.Name))
-				continue
-			}
-
 			ps, err := snapshot.FilterByPreset(preset.ID)
 			if err != nil {
 				logger.Warn(ctx, "failed to find preset snapshot", slog.Error(err), slog.F("preset_id", preset.ID.String()))
@@ -345,6 +340,11 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
 		slog.F("preset_name", ps.Preset.Name),
 	)
 
+	if ps.IsHardLimited {
+		logger.Debug(ctx, "skipping hard limited preset", slog.F("preset_id", ps.Preset.ID), slog.F("name", ps.Preset.Name))
+		return nil
+	}
+
 	state := ps.CalculateState()
 	actions, err := c.CalculateActions(ctx, ps)
 	if err != nil {
