temporary commit

evgeniy-scherbina · evgeniy-scherbina · commit 109b9126e1c8 · 2025-05-27T14:09:08.000Z
diff --git a/coderd/prebuilds/global_snapshot.go b/coderd/prebuilds/global_snapshot.go
@@ -80,6 +80,14 @@ func (s GlobalSnapshot) FilterByPreset(presetID uuid.UUID) (*PresetSnapshot, err
 	}, nil
 }
 
+func (s GlobalSnapshot) IsHardLimited(presetID uuid.UUID) bool {
+	_, isHardLimited := slice.Find(s.HardLimitedPresets, func(row database.GetPresetsAtFailureLimitRow) bool {
+		return row.PresetID == presetID
+	})
+
+	return isHardLimited
+}
+
 // filterExpiredWorkspaces splits running workspaces into expired and non-expired
 // based on the preset's TTL.
 // If TTL is missing or zero, all workspaces are considered non-expired.
diff --git a/enterprise/coderd/prebuilds/metricscollector.go b/enterprise/coderd/prebuilds/metricscollector.go
@@ -281,15 +281,9 @@ func (k hardLimitedPresetKey) String() string {
 }
 
 // nolint:revive // isHardLimited determines if the preset should be reported as hard-limited in Prometheus.
-func (mc *MetricsCollector) trackHardLimitedStatus(orgName, templateName, presetName string, isHardLimited bool) {
+func (mc *MetricsCollector) trackHardLimitedStatus(isPresetHardLimited map[hardLimitedPresetKey]bool) {
 	mc.isPresetHardLimitedMu.Lock()
 	defer mc.isPresetHardLimitedMu.Unlock()
 
-	key := hardLimitedPresetKey{orgName: orgName, templateName: templateName, presetName: presetName}
-
-	if isHardLimited {
-		mc.isPresetHardLimited[key] = true
-	} else {
-		delete(mc.isPresetHardLimited, key)
-	}
+	mc.isPresetHardLimited = isPresetHardLimited
 }
diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -256,6 +256,30 @@ func (c *StoreReconciler) ReconcileAll(ctx context.Context) error {
 		if err != nil {
 			return xerrors.Errorf("determine current snapshot: %w", err)
 		}
+
+		presetsMap := make(map[hardLimitedPresetKey][]database.GetTemplatePresetsWithPrebuildsRow)
+		for _, preset := range snapshot.Presets {
+			key := hardLimitedPresetKey{
+				orgName:      preset.OrganizationName,
+				templateName: preset.TemplateName,
+				presetName:   preset.Name,
+			}
+
+			presetsMap[key] = append(presetsMap[key], preset)
+		}
+
+		isPresetHardLimited := make(map[hardLimitedPresetKey]bool)
+		for key, presets := range presetsMap {
+			for _, preset := range presets {
+				if preset.UsingActiveVersion && !preset.Deleted {
+					isPresetHardLimited[key] = snapshot.IsHardLimited(preset.ID)
+					break
+				}
+			}
+		}
+
+		c.metrics.trackHardLimitedStatus(isPresetHardLimited)
+
 		if len(snapshot.Presets) == 0 {
 			logger.Debug(ctx, "no templates found with prebuilds configured")
 			return nil
@@ -375,9 +399,9 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
 	// 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 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
diff --git a/enterprise/coderd/prebuilds/reconcile_test.go b/enterprise/coderd/prebuilds/reconcile_test.go
@@ -1043,9 +1043,7 @@ func TestHardLimitedPresetShouldNotBlockDeletion(t *testing.T) {
 				"preset_name":   preset.Name,
 				"org_name":      org.Name,
 			})
-			require.NotNil(t, metric)
-			require.NotNil(t, metric.GetGauge())
-			require.EqualValues(t, 1, metric.GetGauge().GetValue())
+			require.Nil(t, metric)
 		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1043,9 +1043,7 @@ func TestHardLimitedPresetShouldNotBlockDeletion(t *testing.T) {`
`1043`	`1043`	`"preset_name": preset.Name,`
`1044`	`1044`	`"org_name": org.Name,`
`1045`	`1045`	`})`
`1046`		`- require.NotNil(t, metric)`
`1047`		`- require.NotNil(t, metric.GetGauge())`
`1048`		`- require.EqualValues(t, 1, metric.GetGauge().GetValue())`
	`1046`	`+ require.Nil(t, metric)`
`1049`	`1047`	`})`
`1050`	`1048`	`}`
`1051`	`1049`	`}`