minor fixes

evgeniy-scherbina · evgeniy-scherbina · commit 975358c53a8d · 2025-05-27T15:14:51.000Z
diff --git a/coderd/prebuilds/global_snapshot.go b/coderd/prebuilds/global_snapshot.go
@@ -12,11 +12,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
-	HardLimitedPresets  []database.GetPresetsAtFailureLimitRow
+	Presets               []database.GetTemplatePresetsWithPrebuildsRow
+	RunningPrebuilds      []database.GetRunningPrebuiltWorkspacesRow
+	PrebuildsInProgress   []database.CountInProgressPrebuildsRow
+	Backoffs              []database.GetPresetsBackoffRow
+	HardLimitedPresetsMap map[uuid.UUID]database.GetPresetsAtFailureLimitRow
 }
 
 func NewGlobalSnapshot(
@@ -26,12 +26,17 @@ func NewGlobalSnapshot(
 	backoffs []database.GetPresetsBackoffRow,
 	hardLimitedPresets []database.GetPresetsAtFailureLimitRow,
 ) GlobalSnapshot {
+	hardLimitedPresetsMap := make(map[uuid.UUID]database.GetPresetsAtFailureLimitRow, len(hardLimitedPresets))
+	for _, preset := range hardLimitedPresets {
+		hardLimitedPresetsMap[preset.PresetID] = preset
+	}
+
 	return GlobalSnapshot{
-		Presets:             presets,
-		RunningPrebuilds:    runningPrebuilds,
-		PrebuildsInProgress: prebuildsInProgress,
-		Backoffs:            backoffs,
-		HardLimitedPresets:  hardLimitedPresets,
+		Presets:               presets,
+		RunningPrebuilds:      runningPrebuilds,
+		PrebuildsInProgress:   prebuildsInProgress,
+		Backoffs:              backoffs,
+		HardLimitedPresetsMap: hardLimitedPresetsMap,
 	}
 }
 
@@ -66,9 +71,7 @@ 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
-	})
+	_, isHardLimited := s.HardLimitedPresetsMap[preset.ID]
 
 	return &PresetSnapshot{
 		Preset:        preset,
@@ -81,9 +84,7 @@ func (s GlobalSnapshot) FilterByPreset(presetID uuid.UUID) (*PresetSnapshot, err
 }
 
 func (s GlobalSnapshot) IsHardLimited(presetID uuid.UUID) bool {
-	_, isHardLimited := slice.Find(s.HardLimitedPresets, func(row database.GetPresetsAtFailureLimitRow) bool {
-		return row.PresetID == presetID
-	})
+	_, isHardLimited := s.HardLimitedPresetsMap[presetID]
 
 	return isHardLimited
 }
diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -299,21 +299,6 @@ func (c *StoreReconciler) ReconcileAll(ctx context.Context) error {
 	return err
 }
 
-// Report a metric only if the preset uses the latest version of the template and the template is not deleted.
-// This avoids conflicts between metrics from old and new template versions.
-//
-// NOTE: Multiple versions of a preset can exist with the same orgName, templateName, and presetName,
-// because templates can have multiple versions — or deleted templates can share the same name.
-//
-// The safest approach is to report the metric only for the latest version of the preset.
-// When a new template version is released, the metric for the new preset should overwrite
-// the old value in Prometheus.
-//
-// However, there’s one edge case: if an admin creates a template, it becomes hard-limited,
-// then deletes the template and never creates another with the same name,
-// the old preset will continue to be reported as hard-limited —
-// even though it’s deleted. This will persist until `coderd` is restarted.
-
 func (c *StoreReconciler) reportHardLimitedPresets(snapshot *prebuilds.GlobalSnapshot) {
 	// presetsMap is a map from key (orgName:templateName:presetName) to list of corresponding presets.
 	// Multiple versions of a preset can exist with the same orgName, templateName, and presetName,
@@ -414,24 +399,6 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
 		slog.F("preset_name", ps.Preset.Name),
 	)
 
-	// Report a metric only if the preset uses the latest version of the template and the template is not deleted.
-	// This avoids conflicts between metrics from old and new template versions.
-	//
-	// NOTE: Multiple versions of a preset can exist with the same orgName, templateName, and presetName,
-	// because templates can have multiple versions — or deleted templates can share the same name.
-	//
-	// The safest approach is to report the metric only for the latest version of the preset.
-	// When a new template version is released, the metric for the new preset should overwrite
-	// the old value in Prometheus.
-	//
-	// However, there’s one edge case: if an admin creates a template, it becomes hard-limited,
-	// then deletes the template and never creates another with the same name,
-	// the old preset will continue to be reported as hard-limited —
-	// even though it’s deleted. This will persist until `coderd` is restarted.
-	//if ps.Preset.UsingActiveVersion && !ps.Preset.Deleted {
-	//	c.metrics.trackHardLimitedStatus(ps.Preset.OrganizationName, ps.Preset.TemplateName, ps.Preset.Name, ps.IsHardLimited)
-	//}
-
 	// If the preset reached the hard failure limit for the first time during this iteration:
 	// - Mark it as hard-limited in the database
 	// - Send notifications to template admins
