cleanup native histogram validation const (#6114)

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

CHANGELOG.md

@@ -36,6 +36,7 @@
 * [BUGFIX] Querier: Enforce max query length check for `/api/v1/series` API even though `ignoreMaxQueryLength` is set to true. #6018
 * [BUGFIX] Ingester: Fix issue with the minimize token generator where it was not taking in consideration the current ownerhip of an instance when generating extra tokens. #6062
 * [BUGFIX] Scheduler: Fix user queue in scheduler that was not thread-safe. #6077
+* [BUGFIX] Ingester: Include out-of-order head compaction when compacting TSDB head. #6108
 
 ## 1.17.1 2024-05-20
 

pkg/cortexpb/histograms.go

@@ -15,11 +15,6 @@ package cortexpb
 
 import "github.com/prometheus/prometheus/model/histogram"
 
-const (
-	ExponentialSchemaMax int32 = 8
-	ExponentialSchemaMin int32 = -4
-)
-
 func (h Histogram) IsFloatHistogram() bool {
 	_, ok := h.GetCount().(*Histogram_CountFloat)
 	return ok

pkg/util/validation/validate.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/cortexproject/cortex/pkg/cortexpb"
@@ -265,57 +266,57 @@ func ValidateMetadata(validateMetrics *ValidateMetrics, cfg *Limits, userID stri
 	return nil
 }
 
-func ValidateNativeHistogram(validateMetrics *ValidateMetrics, limits *Limits, userID string, ls []cortexpb.LabelAdapter, histogram cortexpb.Histogram) (cortexpb.Histogram, error) {
+func ValidateNativeHistogram(validateMetrics *ValidateMetrics, limits *Limits, userID string, ls []cortexpb.LabelAdapter, histogramSample cortexpb.Histogram) (cortexpb.Histogram, error) {
 	if limits.MaxNativeHistogramBuckets == 0 {
-		return histogram, nil
+		return histogramSample, nil
 	}
 
 	var (
 		exceedLimit bool
 	)
-	if histogram.IsFloatHistogram() {
+	if histogramSample.IsFloatHistogram() {
 		// Initial check to see if the bucket limit is exceeded or not. If not, we can avoid type casting.
-		exceedLimit = len(histogram.PositiveCounts)+len(histogram.NegativeCounts) > limits.MaxNativeHistogramBuckets
+		exceedLimit = len(histogramSample.PositiveCounts)+len(histogramSample.NegativeCounts) > limits.MaxNativeHistogramBuckets
 		if !exceedLimit {
-			return histogram, nil
+			return histogramSample, nil
 		}
 		// Exceed limit.
-		if histogram.Schema <= cortexpb.ExponentialSchemaMin {
+		if histogramSample.Schema <= histogram.ExponentialSchemaMin {
 			validateMetrics.DiscardedSamples.WithLabelValues(nativeHistogramBucketCountLimitExceeded, userID).Inc()
 			return cortexpb.Histogram{}, newHistogramBucketLimitExceededError(ls, limits.MaxNativeHistogramBuckets)
 		}
-		fh := cortexpb.FloatHistogramProtoToFloatHistogram(histogram)
+		fh := cortexpb.FloatHistogramProtoToFloatHistogram(histogramSample)
 		for len(fh.PositiveBuckets)+len(fh.NegativeBuckets) > limits.MaxNativeHistogramBuckets {
-			if fh.Schema <= cortexpb.ExponentialSchemaMin {
+			if fh.Schema <= histogram.ExponentialSchemaMin {
 				validateMetrics.DiscardedSamples.WithLabelValues(nativeHistogramBucketCountLimitExceeded, userID).Inc()
 				return cortexpb.Histogram{}, newHistogramBucketLimitExceededError(ls, limits.MaxNativeHistogramBuckets)
 			}
 			fh = fh.ReduceResolution(fh.Schema - 1)
 		}
 		// If resolution reduced, convert new float histogram to protobuf type again.
-		return cortexpb.FloatHistogramToHistogramProto(histogram.TimestampMs, fh), nil
+		return cortexpb.FloatHistogramToHistogramProto(histogramSample.TimestampMs, fh), nil
 	}
 
 	// Initial check to see if bucket limit is exceeded or not. If not, we can avoid type casting.
-	exceedLimit = len(histogram.PositiveDeltas)+len(histogram.NegativeDeltas) > limits.MaxNativeHistogramBuckets
+	exceedLimit = len(histogramSample.PositiveDeltas)+len(histogramSample.NegativeDeltas) > limits.MaxNativeHistogramBuckets
 	if !exceedLimit {
-		return histogram, nil
+		return histogramSample, nil
 	}
 	// Exceed limit.
-	if histogram.Schema <= cortexpb.ExponentialSchemaMin {
+	if histogramSample.Schema <= histogram.ExponentialSchemaMin {
 		validateMetrics.DiscardedSamples.WithLabelValues(nativeHistogramBucketCountLimitExceeded, userID).Inc()
 		return cortexpb.Histogram{}, newHistogramBucketLimitExceededError(ls, limits.MaxNativeHistogramBuckets)
 	}
-	h := cortexpb.HistogramProtoToHistogram(histogram)
+	h := cortexpb.HistogramProtoToHistogram(histogramSample)
 	for len(h.PositiveBuckets)+len(h.NegativeBuckets) > limits.MaxNativeHistogramBuckets {
-		if h.Schema <= cortexpb.ExponentialSchemaMin {
+		if h.Schema <= histogram.ExponentialSchemaMin {
 			validateMetrics.DiscardedSamples.WithLabelValues(nativeHistogramBucketCountLimitExceeded, userID).Inc()
 			return cortexpb.Histogram{}, newHistogramBucketLimitExceededError(ls, limits.MaxNativeHistogramBuckets)
 		}
 		h = h.ReduceResolution(h.Schema - 1)
 	}
 	// If resolution reduced, convert new histogram to protobuf type again.
-	return cortexpb.HistogramToHistogramProto(histogram.TimestampMs, h), nil
+	return cortexpb.HistogramToHistogramProto(histogramSample.TimestampMs, h), nil
 }
 
 func DeletePerUserValidationMetrics(validateMetrics *ValidateMetrics, userID string, log log.Logger) {

pkg/util/validation/validate_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/tsdb/tsdbutil"
 	"github.com/stretchr/testify/assert"
@@ -303,9 +304,9 @@ func TestValidateNativeHistogram(t *testing.T) {
 	fh := tsdbutil.GenerateTestFloatHistogram(0)
 
 	histogramWithSchemaMin := tsdbutil.GenerateTestHistogram(0)
-	histogramWithSchemaMin.Schema = cortexpb.ExponentialSchemaMin
+	histogramWithSchemaMin.Schema = histogram.ExponentialSchemaMin
 	floatHistogramWithSchemaMin := tsdbutil.GenerateTestFloatHistogram(0)
-	floatHistogramWithSchemaMin.Schema = cortexpb.ExponentialSchemaMin
+	floatHistogramWithSchemaMin.Schema = histogram.ExponentialSchemaMin
 	for _, tc := range []struct {
 		name              string
 		bucketLimit       int