diff --git a/.github/workflows/distribution.yml b/.github/workflows/distribution.yml index bac83645392..d8cc5594afa 100644 --- a/.github/workflows/distribution.yml +++ b/.github/workflows/distribution.yml @@ -10,7 +10,7 @@ jobs: build-dist: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index 6950325c945..ee2696660ab 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -17,7 +17,7 @@ jobs: lint: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -53,7 +53,7 @@ jobs: name: test (${{ matrix.name }}) runs-on: ${{ matrix.runner }} container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -81,7 +81,7 @@ jobs: name: test-no-race (${{ matrix.name }}) runs-on: ${{ matrix.runner }} container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -162,7 +162,7 @@ jobs: build: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b outputs: image_tag: ${{ steps.image-tag.outputs.image_tag }} steps: @@ -215,7 +215,7 @@ jobs: name: build-integration-tests (${{ matrix.arch }}) runs-on: ${{ matrix.runner }} container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -357,7 +357,7 @@ jobs: if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex' runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-5607698940 + image: quay.io/cortexproject/build-image:master-7bc8b2491b steps: - name: Checkout Repo uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index dd279cfa131..3354c8e9b35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ * [ENHANCEMENT] Upgrade Thanos and promql-engine to latest. #7740 * [ENHANCEMENT] Ruler: Adjust ruler frontend decoder to not wrap query error messages with execution prefix, this makes error responses consistent between internal and external ruler paths. #7741 * [ENHANCEMENT] Distributor: Deduplicate metric metadata when converting PRW 2.0 requests. PRW 2.0 attaches metadata to every series, so a metric family was previously expanded into one `MetricMetadata` per series. #7760 +* [ENHANCEMENT] Update build image and Go version to 1.27.0. #7814 * [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370 * [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380 * [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389 diff --git a/Makefile b/Makefile index fadb0b3a961..22bd3821701 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ build-image/$(UPTODATE): build-image/* SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E") BUILD_IN_CONTAINER := true BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image -LATEST_BUILD_IMAGE_TAG ?= master-5607698940 +LATEST_BUILD_IMAGE_TAG ?= master-7bc8b2491b # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden @@ -223,7 +223,7 @@ check-protos: clean-protos protos @git diff --exit-code -- $(PROTO_GOS) modernize: - GOTOOLCHAIN=auto go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.22.0 -fix ./... + GOTOOLCHAIN=auto go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.23.0 -fix ./... # Generates the config file documentation. doc: clean-doc diff --git a/go.mod b/go.mod index 78261bbde9d..48af58b8b3d 100644 --- a/go.mod +++ b/go.mod @@ -1,26 +1,35 @@ module github.com/cortexproject/cortex -go 1.26.0 +go 1.27.0 require ( github.com/Masterminds/squirrel v1.5.4 + github.com/VictoriaMetrics/fastcache v1.13.3 github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b github.com/alicebob/miniredis/v2 v2.38.0 + github.com/aws/aws-sdk-go-v2 v1.42.0 + github.com/aws/aws-sdk-go-v2/config v1.32.26 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.59.1 + github.com/axiomhq/hyperloglog v0.2.6 + github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf + github.com/cespare/xxhash/v2 v2.3.0 github.com/cortexproject/promqlsmith v0.0.0-20260205231645-0c8ef5fe46a5 github.com/dustin/go-humanize v1.0.1 + github.com/edsrzf/mmap-go v1.2.0 github.com/efficientgo/core v1.0.0-rc.3 github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb github.com/felixge/fgprof v0.9.5 github.com/go-kit/log v0.2.1 github.com/go-openapi/strfmt v0.26.4 - github.com/go-openapi/swag v0.26.0 // indirect + github.com/go-openapi/swag/jsonutils v0.27.0 github.com/go-redis/redis/v8 v8.11.5 github.com/gogo/protobuf v1.3.2 github.com/gogo/status v1.1.1 github.com/golang-migrate/migrate/v4 v4.19.1 - github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v1.0.0 + github.com/google/go-cmp v0.7.0 + github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 @@ -28,35 +37,44 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-metrics v0.6.0 github.com/hashicorp/go-sockaddr v1.0.7 + github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/hashicorp/memberlist v0.5.4 github.com/json-iterator/go v1.1.12 github.com/klauspost/compress v1.18.7 - github.com/lib/pq v1.11.2 // indirect github.com/minio/minio-go/v7 v7.2.1 github.com/mitchellh/go-wordwrap v1.0.1 + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 github.com/oklog/ulid v1.3.1 + github.com/oklog/ulid/v2 v2.1.1 github.com/opentracing-contrib/go-grpc v0.1.4 github.com/opentracing-contrib/go-stdlib v1.1.1 github.com/opentracing/opentracing-go v1.2.0 + github.com/parquet-go/parquet-go v0.30.1 github.com/pkg/errors v0.9.1 + github.com/prometheus-community/parquet-common v0.0.0-20260614025832-5f32460b5373 github.com/prometheus/alertmanager v0.33.0 github.com/prometheus/client_golang v1.23.2 + github.com/prometheus/client_golang/exp v0.0.0-20251212205219-7ba246a648ca github.com/prometheus/client_model v0.6.2 github.com/prometheus/common v0.69.0 + github.com/prometheus/procfs v0.21.0 // Prometheus maps version 3.x.y to tags v0.30x.y. github.com/prometheus/prometheus v0.309.1 github.com/segmentio/fasthash v1.0.3 + github.com/sercand/kuberesolver/v5 v5.1.1 github.com/sony/gobreaker v1.0.0 github.com/spf13/afero v1.15.0 github.com/stretchr/testify v1.11.1 github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488 github.com/thanos-io/promql-engine v0.0.0-20260729073658-f8bd3f940687 github.com/thanos-io/thanos v0.42.1-0.20260727122508-92397939e4cc + github.com/tjhop/slog-gokit v0.2.0 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5 go.etcd.io/etcd/api/v3 v3.5.17 go.etcd.io/etcd/client/pkg/v3 v3.5.17 go.etcd.io/etcd/client/v3 v3.5.17 + go.opentelemetry.io/collector/pdata v1.61.0 go.opentelemetry.io/contrib/propagators/aws v1.44.0 go.opentelemetry.io/otel v1.45.0 go.opentelemetry.io/otel/bridge/opentracing v1.45.0 @@ -65,40 +83,16 @@ require ( go.opentelemetry.io/otel/sdk v1.44.0 go.opentelemetry.io/otel/trace v1.45.0 go.uber.org/atomic v1.11.0 + go.uber.org/automaxprocs v1.6.0 golang.org/x/net v0.57.0 golang.org/x/sync v0.22.0 golang.org/x/time v0.15.0 google.golang.org/grpc v1.83.0 + google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 ) -require ( - github.com/VictoriaMetrics/fastcache v1.13.3 - github.com/aws/aws-sdk-go-v2 v1.42.0 - github.com/aws/aws-sdk-go-v2/config v1.32.26 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.59.1 - github.com/axiomhq/hyperloglog v0.2.6 - github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 - github.com/cespare/xxhash/v2 v2.3.0 - github.com/edsrzf/mmap-go v1.2.0 - github.com/go-openapi/swag/jsonutils v0.27.0 - github.com/google/go-cmp v0.7.0 - github.com/google/uuid v1.6.0 - github.com/hashicorp/golang-lru/v2 v2.0.7 - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/oklog/ulid/v2 v2.1.1 - github.com/parquet-go/parquet-go v0.30.1 - github.com/prometheus-community/parquet-common v0.0.0-20260614025832-5f32460b5373 - github.com/prometheus/client_golang/exp v0.0.0-20251212205219-7ba246a648ca - github.com/prometheus/procfs v0.21.0 - github.com/sercand/kuberesolver/v5 v5.1.1 - github.com/tjhop/slog-gokit v0.2.0 - go.opentelemetry.io/collector/pdata v1.61.0 - go.uber.org/automaxprocs v1.6.0 - google.golang.org/protobuf v1.36.11 -) - require ( cel.dev/expr v0.25.2 // indirect cloud.google.com/go v0.121.6 // indirect @@ -172,6 +166,7 @@ require ( github.com/go-openapi/loads v0.23.3 // indirect github.com/go-openapi/runtime v0.29.4 // indirect github.com/go-openapi/spec v0.22.4 // indirect + github.com/go-openapi/swag v0.26.0 // indirect github.com/go-openapi/swag/cmdutils v0.26.0 // indirect github.com/go-openapi/swag/conv v0.27.0 // indirect github.com/go-openapi/swag/fileutils v0.26.0 // indirect @@ -189,6 +184,7 @@ require ( github.com/gogo/googleapis v1.4.1 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.3 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect @@ -219,6 +215,7 @@ require ( github.com/kylelemons/godebug v1.1.0 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/lib/pq v1.11.2 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/socket v0.5.1 // indirect diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go index 6557b4236e1..ef1388b271e 100644 --- a/integration/query_fuzz_test.go +++ b/integration/query_fuzz_test.go @@ -1599,10 +1599,10 @@ func TestStoreGatewayLazyExpandedPostingsSeriesFuzzWithPrometheus(t *testing.T) flags := mergeFlags(BlocksStorageFlags(), map[string]string{ "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-ring.store": "consul", - "-consul.hostname": consul.NetworkHTTPEndpoint(), - "-store-gateway.sharding-enabled": "false", - "-blocks-storage.bucket-store.sync-interval": "1s", + "-ring.store": "consul", + "-consul.hostname": consul.NetworkHTTPEndpoint(), + "-store-gateway.sharding-enabled": "false", + "-blocks-storage.bucket-store.sync-interval": "1s", "-blocks-storage.bucket-store.lazy-expanded-postings-enabled": "true", }) diff --git a/pkg/alertmanager/alertmanager_test.go b/pkg/alertmanager/alertmanager_test.go index 04352c420b6..e8b03812696 100644 --- a/pkg/alertmanager/alertmanager_test.go +++ b/pkg/alertmanager/alertmanager_test.go @@ -143,33 +143,29 @@ route: inputAlerts := []*alert.Alert{ { - Alert: model.Alert{ - Labels: model.LabelSet{ - "alertname": alertName, - "a": "b", - }, - Annotations: model.LabelSet{"foo": "bar"}, - StartsAt: now, - EndsAt: now.Add(5 * time.Minute), - GeneratorURL: "http://example.com/prometheus", + Labels: model.LabelSet{ + "alertname": alertName, + "a": "b", }, - UpdatedAt: now, - Timeout: false, + Annotations: model.LabelSet{"foo": "bar"}, + StartsAt: now, + EndsAt: now.Add(5 * time.Minute), + GeneratorURL: "http://example.com/prometheus", + UpdatedAt: now, + Timeout: false, }, { - Alert: model.Alert{ - Labels: model.LabelSet{ - "alertname": alertName, - "z": "y", - }, - Annotations: model.LabelSet{"foo": "bar"}, - StartsAt: now, - EndsAt: now.Add(5 * time.Minute), - GeneratorURL: "http://example.com/prometheus", + Labels: model.LabelSet{ + "alertname": alertName, + "z": "y", }, - UpdatedAt: now, - Timeout: false, + Annotations: model.LabelSet{"foo": "bar"}, + StartsAt: now, + EndsAt: now.Add(5 * time.Minute), + GeneratorURL: "http://example.com/prometheus", + UpdatedAt: now, + Timeout: false, }, } require.NoError(t, am.alerts.Put(context.Background(), inputAlerts...)) diff --git a/pkg/alertmanager/alertmanagerpb/alertmanager.pb.go b/pkg/alertmanager/alertmanagerpb/alertmanager.pb.go index 1205a76c2f0..f176d389200 100644 --- a/pkg/alertmanager/alertmanagerpb/alertmanager.pb.go +++ b/pkg/alertmanager/alertmanagerpb/alertmanager.pb.go @@ -230,7 +230,7 @@ func init() { func init() { proto.RegisterFile("alertmanager.proto", fileDescriptor_e60437b6e0c74c9a) } var fileDescriptor_e60437b6e0c74c9a = []byte{ - // 518 bytes of a gzipped FileDescriptorProto + // 515 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6f, 0x12, 0x41, 0x14, 0x9e, 0xa1, 0x29, 0xa6, 0x0f, 0x85, 0xed, 0x14, 0x95, 0x70, 0x18, 0x28, 0x5e, 0x08, 0x87, 0xdd, 0x04, 0x4d, 0x8c, 0x9e, 0xda, 0xca, 0x62, 0x9b, 0x46, 0x20, 0x03, 0x5c, 0x4c, 0x0c, 0x19, @@ -262,8 +262,8 @@ var fileDescriptor_e60437b6e0c74c9a = []byte{ 0x1c, 0xde, 0xd1, 0xb1, 0xd1, 0x3c, 0xa9, 0xcc, 0x17, 0x14, 0x5d, 0x2d, 0x28, 0xba, 0x59, 0x50, 0xfc, 0xc5, 0xa7, 0xf8, 0x9b, 0x4f, 0xf1, 0x77, 0x9f, 0xe2, 0xb9, 0x4f, 0xf1, 0x0f, 0x9f, 0xe2, 0x6b, 0x9f, 0xa2, 0x1b, 0x9f, 0xe2, 0xcb, 0x25, 0x45, 0xf3, 0x25, 0x45, 0x57, 0x4b, 0x8a, 0xde, - 0x46, 0xbe, 0xc1, 0x6e, 0x7c, 0xb5, 0xfa, 0x4f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x3b, - 0x2e, 0x32, 0xb0, 0x03, 0x00, 0x00, + 0x46, 0xbe, 0xc1, 0x6e, 0x7c, 0xb5, 0xfa, 0x4f, 0x7f, 0x0d, 0x00, 0x8a, 0x3b, 0x2e, 0x32, 0xb0, + 0x03, 0x00, 0x00, } func (x UpdateStateStatus) String() string { diff --git a/pkg/alertmanager/alertspb/alerts.pb.go b/pkg/alertmanager/alertspb/alerts.pb.go index ca517a24709..e014629182b 100644 --- a/pkg/alertmanager/alertspb/alerts.pb.go +++ b/pkg/alertmanager/alertspb/alerts.pb.go @@ -179,7 +179,7 @@ func init() { func init() { proto.RegisterFile("alerts.proto", fileDescriptor_20493709c38b81dc) } var fileDescriptor_20493709c38b81dc = []byte{ - // 331 bytes of a gzipped FileDescriptorProto + // 328 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x50, 0x3f, 0x4f, 0xc2, 0x40, 0x14, 0xbf, 0x13, 0x25, 0x70, 0x62, 0x34, 0x0d, 0x03, 0x21, 0xf1, 0x95, 0x30, 0x11, 0x87, 0x36, 0xc1, 0xcd, 0x81, 0x44, 0x34, 0x6e, 0x2e, 0xe8, 0xe4, 0x62, 0xae, 0xf5, 0x28, 0x24, 0x2d, 0xd7, @@ -199,8 +199,8 @@ var fileDescriptor_20493709c38b81dc = []byte{ 0x2e, 0xb6, 0x73, 0x1b, 0x7d, 0x2d, 0x6c, 0x34, 0x5b, 0xd8, 0x68, 0xbe, 0xb0, 0x51, 0xbf, 0xb7, 0x5c, 0x03, 0x5a, 0xad, 0x01, 0xed, 0xd6, 0x80, 0x3f, 0x35, 0xe0, 0x6f, 0x0d, 0xf8, 0x47, 0x03, 0x5e, 0x6a, 0xc0, 0xbf, 0x1a, 0xf0, 0x56, 0x03, 0xda, 0x69, 0xc0, 0xb3, 0x0d, 0xa0, 0xe5, 0x06, - 0xd0, 0x6a, 0x03, 0xe8, 0xa5, 0x92, 0x95, 0x8c, 0x3d, 0xaf, 0x6c, 0xde, 0xf3, 0xfa, 0x2f, 0x00, - 0x00, 0xff, 0xff, 0x35, 0x7d, 0x12, 0xe3, 0xc1, 0x01, 0x00, 0x00, + 0xd0, 0x6a, 0x03, 0xe8, 0xa5, 0x92, 0x95, 0x8c, 0x3d, 0xaf, 0x6c, 0xde, 0xf3, 0xfa, 0x6f, 0x00, + 0x35, 0x7d, 0x12, 0xe3, 0xc1, 0x01, 0x00, 0x00, } func (this *AlertConfigDesc) Equal(that interface{}) bool { diff --git a/pkg/alertmanager/merger/v2_alerts_test.go b/pkg/alertmanager/merger/v2_alerts_test.go index 788bb992b5e..a82e4614882 100644 --- a/pkg/alertmanager/merger/v2_alerts_test.go +++ b/pkg/alertmanager/merger/v2_alerts_test.go @@ -73,13 +73,11 @@ func v2alert(fingerprint, annotation, updatedAt string) *v2_models.GettableAlert Name: &receiver, }, }, - StartsAt: v2ParseTime("2020-01-01T12:00:00.000Z"), - Status: &v2_models.AlertStatus{}, - UpdatedAt: v2ParseTime(updatedAt), - Alert: v2_models.Alert{ - GeneratorURL: strfmt.URI("something"), - Labels: v2_models.LabelSet{"label1": "foo"}, - }, + StartsAt: v2ParseTime("2020-01-01T12:00:00.000Z"), + Status: &v2_models.AlertStatus{}, + UpdatedAt: v2ParseTime(updatedAt), + GeneratorURL: strfmt.URI("something"), + Labels: v2_models.LabelSet{"label1": "foo"}, } } diff --git a/pkg/alertmanager/merger/v2_silences_test.go b/pkg/alertmanager/merger/v2_silences_test.go index 97b248077c6..ede18426d89 100644 --- a/pkg/alertmanager/merger/v2_silences_test.go +++ b/pkg/alertmanager/merger/v2_silences_test.go @@ -76,20 +76,18 @@ func v2silence(id, endsAt, updatedAt string) *v2_models.GettableSilence { State: &active, }, UpdatedAt: v2ParseTime(updatedAt), - Silence: v2_models.Silence{ - Comment: &comment, - CreatedBy: &createdBy, - EndsAt: v2ParseTime(endsAt), - Matchers: v2_models.Matchers{ - &v2_models.Matcher{ - IsEqual: &isEqual, - IsRegex: &isRegex, - Name: &name, - Value: &value, - }, + Comment: &comment, + CreatedBy: &createdBy, + EndsAt: v2ParseTime(endsAt), + Matchers: v2_models.Matchers{ + &v2_models.Matcher{ + IsEqual: &isEqual, + IsRegex: &isRegex, + Name: &name, + Value: &value, }, - StartsAt: v2ParseTime("2020-01-01T12:00:00.000Z"), }, + StartsAt: v2ParseTime("2020-01-01T12:00:00.000Z"), } } diff --git a/pkg/alertmanager/multitenant_test.go b/pkg/alertmanager/multitenant_test.go index 26c17c720c4..93dcc769c3e 100644 --- a/pkg/alertmanager/multitenant_test.go +++ b/pkg/alertmanager/multitenant_test.go @@ -713,11 +713,9 @@ receivers: // Create an alert to push. alerts := alert.Alerts(&alert.Alert{ - Alert: model.Alert{ - Labels: map[model.LabelName]model.LabelValue{model.AlertNameLabel: "test"}, - StartsAt: time.Now().Add(-time.Minute), - EndsAt: time.Now().Add(time.Minute), - }, + Labels: map[model.LabelName]model.LabelValue{model.AlertNameLabel: "test"}, + StartsAt: time.Now().Add(-time.Minute), + EndsAt: time.Now().Add(time.Minute), UpdatedAt: time.Now(), Timeout: false, }) diff --git a/pkg/compactor/block_visit_marker_test.go b/pkg/compactor/block_visit_marker_test.go index 46b444b0947..c3611c8bfe5 100644 --- a/pkg/compactor/block_visit_marker_test.go +++ b/pkg/compactor/block_visit_marker_test.go @@ -8,7 +8,6 @@ import ( "github.com/go-kit/log" "github.com/oklog/ulid/v2" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/require" "github.com/thanos-io/objstore" "github.com/thanos-io/thanos/pkg/block/metadata" @@ -36,19 +35,13 @@ func TestMarkBlocksVisited(t *testing.T) { }, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid0, - }, + ULID: ulid0, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid1, - }, + ULID: ulid1, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid2, - }, + ULID: ulid2, }, }, }, @@ -61,19 +54,13 @@ func TestMarkBlocksVisited(t *testing.T) { }, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid0, - }, + ULID: ulid0, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid1, - }, + ULID: ulid1, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid2, - }, + ULID: ulid2, }, }, }, diff --git a/pkg/compactor/compactor_paritioning_test.go b/pkg/compactor/compactor_paritioning_test.go index 5c053b8bc35..4ef42c9516d 100644 --- a/pkg/compactor/compactor_paritioning_test.go +++ b/pkg/compactor/compactor_paritioning_test.go @@ -20,7 +20,6 @@ import ( "github.com/prometheus/client_golang/prometheus" prom_testutil "github.com/prometheus/client_golang/prometheus/testutil" "github.com/prometheus/prometheus/model/labels" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -997,18 +996,14 @@ func TestPartitionCompactor_ShouldSkipOutOrOrderBlocks(t *testing.T) { tsdbPlanner.On("Plan", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: b1, - MinTime: 10, - MaxTime: 20, - }, + ULID: b1, + MinTime: 10, + MaxTime: 20, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: b2, - MinTime: 20, - MaxTime: 30, - }, + ULID: b2, + MinTime: 20, + MaxTime: 30, }, }, nil) @@ -2031,11 +2026,9 @@ func (s *raceConditionTestSetup) createCortexMetaExtensions(creationTime int64) func (s *raceConditionTestSetup) createTestMetadata() []*metadata.Meta { return []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: ulid.MustNew(ulid.Now(), nil), - MinTime: 0, - MaxTime: 2 * 60 * 60 * 1000, - }, + ULID: ulid.MustNew(ulid.Now(), nil), + MinTime: 0, + MaxTime: 2 * 60 * 60 * 1000, }, } } diff --git a/pkg/compactor/compactor_test.go b/pkg/compactor/compactor_test.go index 7e3de069aff..9d5c148619f 100644 --- a/pkg/compactor/compactor_test.go +++ b/pkg/compactor/compactor_test.go @@ -955,18 +955,14 @@ func TestCompactor_ShouldSkipOutOrOrderBlocks(t *testing.T) { tsdbPlanner.On("Plan", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: b1, - MinTime: 10, - MaxTime: 20, - }, + ULID: b1, + MinTime: 10, + MaxTime: 20, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: b2, - MinTime: 20, - MaxTime: 30, - }, + ULID: b2, + MinTime: 20, + MaxTime: 30, }, }, nil) @@ -1735,9 +1731,7 @@ func mockBlockMetaJSONWithTime(id string, orgID string, minTime int64, maxTime i Thanos: metadata.Thanos{ Labels: map[string]string{"__org_id__": orgID}, }, - } - meta.BlockMeta = tsdb.BlockMeta{ Version: 1, ULID: ulid.MustParse(id), MinTime: minTime, @@ -1745,8 +1739,7 @@ func mockBlockMetaJSONWithTime(id string, orgID string, minTime int64, maxTime i Compaction: tsdb.BlockMetaCompaction{ Level: 1, Sources: []ulid.ULID{ulid.MustParse(id)}, - }, - } + }} content, err := json.Marshal(meta) if err != nil { @@ -1987,18 +1980,14 @@ func TestCompactor_ShouldNotTreatInterruptionsAsErrors(t *testing.T) { }) tsdbPlanner.On("Plan", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: b1, - MinTime: 10, - MaxTime: 20, - }, + ULID: b1, + MinTime: 10, + MaxTime: 20, }, { - BlockMeta: tsdb.BlockMeta{ - ULID: b2, - MinTime: 20, - MaxTime: 30, - }, + ULID: b2, + MinTime: 20, + MaxTime: 30, }, }, nil) require.NoError(t, services.StartAndAwaitRunning(ctx, c)) diff --git a/pkg/compactor/partition_compaction_grouper.go b/pkg/compactor/partition_compaction_grouper.go index a304239c172..b3bd0ce2c20 100644 --- a/pkg/compactor/partition_compaction_grouper.go +++ b/pkg/compactor/partition_compaction_grouper.go @@ -500,11 +500,9 @@ func (g *PartitionCompactionGrouper) partitionBlocksGroup(partitionCount int, bl addToPartitionedGroups := func(blocks []*metadata.Meta, partitionID int) { if _, ok := partitionedGroups[partitionID]; !ok { partitionedGroups[partitionID] = blocksGroupWithPartition{ - blocksGroup: blocksGroup{ - rangeStart: rangeStart, - rangeEnd: rangeEnd, - blocks: []*metadata.Meta{}, - }, + rangeStart: rangeStart, + rangeEnd: rangeEnd, + blocks: []*metadata.Meta{}, } } partitionedGroup := partitionedGroups[partitionID] diff --git a/pkg/compactor/partition_compaction_grouper_test.go b/pkg/compactor/partition_compaction_grouper_test.go index 0f64cb80927..f5e2d70ac54 100644 --- a/pkg/compactor/partition_compaction_grouper_test.go +++ b/pkg/compactor/partition_compaction_grouper_test.go @@ -50,28 +50,28 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -88,48 +88,48 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block5, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block6, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -146,28 +146,28 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -188,28 +188,28 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -233,40 +233,40 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -282,40 +282,40 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -335,16 +335,16 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -360,38 +360,38 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -407,38 +407,38 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -458,38 +458,38 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -506,38 +506,38 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block5, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -561,48 +561,48 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block5, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block6, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -620,54 +620,54 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 0}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 2}}}, + ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 2}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block6, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block7, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -700,54 +700,54 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 6 * H, MaxTime: 8 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 6 * H, MaxTime: 8 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block6, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block7, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -764,56 +764,56 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block5, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block6, MinTime: 12 * H, MaxTime: 14 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 14 * H, MaxTime: 16 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block7, MinTime: 14 * H, MaxTime: 16 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -830,56 +830,56 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block6, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block7, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -903,56 +903,56 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block3, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block6, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block7, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -975,23 +975,23 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1006,31 +1006,31 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1045,31 +1045,31 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1084,39 +1084,39 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block4, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block5, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1131,30 +1131,30 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1169,15 +1169,15 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1192,23 +1192,23 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1223,30 +1223,30 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1261,30 +1261,30 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1299,15 +1299,15 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1322,23 +1322,23 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1353,30 +1353,30 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 22 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1391,24 +1391,24 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1423,32 +1423,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1463,32 +1463,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, @@ -1503,24 +1503,24 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 10 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1535,32 +1535,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1575,32 +1575,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1615,24 +1615,24 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1647,32 +1647,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 12 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1687,32 +1687,32 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 12 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 24 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1727,56 +1727,56 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 2}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 2}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 3}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block4, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 4, PartitionID: 3}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block5: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block5, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block5, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block6: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block6, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block6, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 1}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block7: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block7, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block7, MinTime: 4 * H, MaxTime: 6 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 1}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1792,24 +1792,24 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, Stats: tsdb.BlockStats{NumSeries: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}, Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 2}}, - Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, Stats: tsdb.BlockStats{NumSeries: 2}, + Thanos: metadata.Thanos{Files: []metadata.File{{RelPath: thanosblock.IndexFilename, SizeBytes: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1825,16 +1825,16 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block1, MinTime: 2 * H, MaxTime: 4 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1856,22 +1856,22 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block3, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1893,16 +1893,16 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1916,16 +1916,16 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_24, PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_24, PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_24, PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 12 * H, Compaction: tsdb.BlockMetaCompaction{Level: 3}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_24, PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1939,24 +1939,24 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 0}}}, + ULID: block1, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 1}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_12, PartitionCount: 2, PartitionID: 1}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_2, PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 0 * H, MaxTime: 2 * H, Compaction: tsdb.BlockMetaCompaction{Level: 2}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionedGroupID: partitionedGroupID_0_2, PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, @@ -1972,15 +1972,15 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 10*H + 49*M, MaxTime: 16 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 10*H + 49*M, MaxTime: 16 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -1995,15 +1995,15 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 1 * H, MaxTime: 10 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{TimeRange: 24 * H, PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 1 * H, MaxTime: 10 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{TimeRange: 24 * H, PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -2018,15 +2018,15 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: 10*H + 49*M, MaxTime: 11*H + 47*M, Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 1 * H, MaxTime: 10 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}}, - Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, + ULID: block2, MinTime: 1 * H, MaxTime: 10 * H, Compaction: tsdb.BlockMetaCompaction{Level: 4}, + Thanos: metadata.Thanos{Extensions: cortextsdb.CortexMetaExtensions{PartitionInfo: &cortextsdb.PartitionInfo{PartitionCount: 1, PartitionID: 0}}}, }, timeRange: 24 * time.Hour, hasNoCompactMark: false, @@ -2041,28 +2041,28 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) { blocks: map[ulid.ULID]mockBlock{ block1: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block1, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block2: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block2, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block3: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block3, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, }, block4: { meta: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ULID: block4, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}}, + ULID: block4, MinTime: getRangeStartBasedOnNow(2*time.Hour) - 2*time.Hour.Milliseconds(), MaxTime: getRangeStartBasedOnNow(2 * time.Hour), Compaction: tsdb.BlockMetaCompaction{Level: 1}, }, timeRange: 2 * time.Hour, hasNoCompactMark: false, diff --git a/pkg/compactor/partition_compaction_planner_test.go b/pkg/compactor/partition_compaction_planner_test.go index f25c648c4c7..6960c8b543a 100644 --- a/pkg/compactor/partition_compaction_planner_test.go +++ b/pkg/compactor/partition_compaction_planner_test.go @@ -11,7 +11,6 @@ import ( "github.com/go-kit/log" "github.com/oklog/ulid/v2" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -49,18 +48,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -69,18 +64,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { }, expected: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, }, @@ -88,18 +79,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 2 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 2 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -112,18 +99,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -136,18 +119,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -161,25 +140,19 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { noCompactBlocks: map[ulid.ULID]*metadata.NoCompactMark{block1ulid: {}}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block3ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block3ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -188,18 +161,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { }, expected: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block3ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block3ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, }, @@ -208,11 +177,9 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { noCompactBlocks: map[ulid.ULID]*metadata.NoCompactMark{block1ulid: {}}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -225,18 +192,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -249,18 +212,14 @@ func TestPartitionCompactionPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedPartition: VisitedPartition{ @@ -460,8 +419,8 @@ func TestPartitionCompactionPlanner_PlanWithDeletionMarkFilter(t *testing.T) { p := createPlanner(bkt) blocks := []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, - {BlockMeta: tsdb.BlockMeta{ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, + {ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + {ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, } actual, err := p.Plan(context.Background(), blocks, nil, &cortextsdb.CortexMetaExtensions{ @@ -491,9 +450,9 @@ func TestPartitionCompactionPlanner_PlanWithDeletionMarkFilter(t *testing.T) { p := createPlanner(bkt) blocks := []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, - {BlockMeta: tsdb.BlockMeta{ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, - {BlockMeta: tsdb.BlockMeta{ULID: block3ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, + {ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + {ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + {ULID: block3ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, } actual, err := p.Plan(context.Background(), blocks, nil, &cortextsdb.CortexMetaExtensions{ @@ -522,9 +481,9 @@ func TestPartitionCompactionPlanner_PlanWithDeletionMarkFilter(t *testing.T) { p := createPlanner(bkt) blocks := []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, - {BlockMeta: tsdb.BlockMeta{ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, - {BlockMeta: tsdb.BlockMeta{ULID: block3ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}}, + {ULID: block1ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + {ULID: block2ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + {ULID: block3ulid, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, } actual, err := p.Plan(context.Background(), blocks, nil, &cortextsdb.CortexMetaExtensions{ diff --git a/pkg/compactor/sharded_compaction_lifecycle_callback_test.go b/pkg/compactor/sharded_compaction_lifecycle_callback_test.go index 9e598a2edc5..75850fcec60 100644 --- a/pkg/compactor/sharded_compaction_lifecycle_callback_test.go +++ b/pkg/compactor/sharded_compaction_lifecycle_callback_test.go @@ -10,7 +10,6 @@ import ( "github.com/go-kit/log" "github.com/oklog/ulid/v2" "github.com/prometheus/prometheus/model/labels" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/require" "github.com/thanos-io/thanos/pkg/block/metadata" "github.com/thanos-io/thanos/pkg/compact" @@ -33,13 +32,13 @@ func TestPreCompactionCallback(t *testing.T) { block3 := ulid.MustNew(3, nil) meta := []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ULID: block1, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + ULID: block1, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ULID: block2, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds()}, + ULID: block2, MinTime: 1 * time.Hour.Milliseconds(), MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ULID: block3, MinTime: 2 * time.Hour.Milliseconds(), MaxTime: 3 * time.Hour.Milliseconds()}, + ULID: block3, MinTime: 2 * time.Hour.Milliseconds(), MaxTime: 3 * time.Hour.Milliseconds(), }, } testGroupKey := "test_group_key" diff --git a/pkg/compactor/shuffle_sharding_grouper_test.go b/pkg/compactor/shuffle_sharding_grouper_test.go index 3ff91003755..4fa90acacf1 100644 --- a/pkg/compactor/shuffle_sharding_grouper_test.go +++ b/pkg/compactor/shuffle_sharding_grouper_test.go @@ -432,167 +432,167 @@ func TestGroupBlocksByCompactableRanges(t *testing.T) { "only 1 block in input": { ranges: []int64{20}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, + {MinTime: 10, MaxTime: 20}, }, expected: nil, }, "only 1 block for each range (single range)": { ranges: []int64{20}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 40, MaxTime: 60}, }, expected: nil, }, "only 1 block for each range (multiple ranges)": { ranges: []int64{10, 20}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 40, MaxTime: 60}, }, expected: nil, }, "input blocks can be compacted on the 1st range only": { ranges: []int64{20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 25, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 50}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 50, MaxTime: 60}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 60, MaxTime: 70}}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 25, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, + {MinTime: 40, MaxTime: 50}, + {MinTime: 50, MaxTime: 60}, + {MinTime: 60, MaxTime: 70}, }, expected: []blocksGroup{ {rangeStart: 20, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 25, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 25, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, }}, {rangeStart: 40, rangeEnd: 60, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 50}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 50, MaxTime: 60}}, + {MinTime: 40, MaxTime: 50}, + {MinTime: 50, MaxTime: 60}, }}, }, }, "input blocks can be compacted on the 2nd range only": { ranges: []int64{10, 20}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 60, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 70, MaxTime: 80}}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, + {MinTime: 40, MaxTime: 60}, + {MinTime: 60, MaxTime: 70}, + {MinTime: 70, MaxTime: 80}, }, expected: []blocksGroup{ {rangeStart: 20, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, }}, {rangeStart: 60, rangeEnd: 80, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 60, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 70, MaxTime: 80}}, + {MinTime: 60, MaxTime: 70}, + {MinTime: 70, MaxTime: 80}, }}, }, }, "input blocks can be compacted on a mix of 1st and 2nd ranges, guaranteeing no overlaps and giving preference to smaller ranges": { ranges: []int64{10, 20}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 10}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 7, MaxTime: 10}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 60, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 70, MaxTime: 80}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 75, MaxTime: 80}}, + {MinTime: 0, MaxTime: 10}, + {MinTime: 7, MaxTime: 10}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, + {MinTime: 40, MaxTime: 60}, + {MinTime: 60, MaxTime: 70}, + {MinTime: 70, MaxTime: 80}, + {MinTime: 75, MaxTime: 80}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 10, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 10}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 7, MaxTime: 10}}, + {MinTime: 0, MaxTime: 10}, + {MinTime: 7, MaxTime: 10}, }}, {rangeStart: 70, rangeEnd: 80, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 70, MaxTime: 80}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 75, MaxTime: 80}}, + {MinTime: 70, MaxTime: 80}, + {MinTime: 75, MaxTime: 80}, }}, {rangeStart: 20, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, }}, }, }, "input blocks have already been compacted with the largest range": { ranges: []int64{10, 20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, + {MinTime: 0, MaxTime: 40}, + {MinTime: 40, MaxTime: 70}, + {MinTime: 80, MaxTime: 120}, }, expected: nil, }, "input blocks match the largest range but can be compacted because overlapping": { ranges: []int64{10, 20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, + {MinTime: 0, MaxTime: 40}, + {MinTime: 40, MaxTime: 70}, + {MinTime: 80, MaxTime: 120}, + {MinTime: 80, MaxTime: 120}, }, expected: []blocksGroup{ {rangeStart: 80, rangeEnd: 120, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, + {MinTime: 80, MaxTime: 120}, + {MinTime: 80, MaxTime: 120}, }}, }, }, "a block with time range crossing two 1st level ranges should be NOT considered for 1st level compaction": { ranges: []int64{20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 30}}, // This block spans across two 1st level ranges. - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 10, MaxTime: 30}, // This block spans across two 1st level ranges. + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, }, expected: []blocksGroup{ {rangeStart: 20, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 40}}, + {MinTime: 20, MaxTime: 30}, + {MinTime: 30, MaxTime: 40}, }}, }, }, "a block with time range crossing two 1st level ranges should BE considered for 2nd level compaction": { ranges: []int64{20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 30}}, // This block spans across two 1st level ranges. - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 40}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 10, MaxTime: 30}, // This block spans across two 1st level ranges. + {MinTime: 20, MaxTime: 40}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 30}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 40}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 10, MaxTime: 30}, + {MinTime: 20, MaxTime: 40}, }}, }, }, "a block with time range larger then the largest compaction range should NOT be considered for compaction": { ranges: []int64{10, 20, 40}, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 30, MaxTime: 150}}, // This block is larger then the largest compaction range. - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 70}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, + {MinTime: 0, MaxTime: 40}, + {MinTime: 30, MaxTime: 150}, // This block is larger then the largest compaction range. + {MinTime: 40, MaxTime: 70}, + {MinTime: 80, MaxTime: 120}, + {MinTime: 80, MaxTime: 120}, }, expected: []blocksGroup{ {rangeStart: 80, rangeEnd: 120, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 80, MaxTime: 120}}, + {MinTime: 80, MaxTime: 120}, + {MinTime: 80, MaxTime: 120}, }}, }, }, @@ -619,80 +619,80 @@ func TestGroupBlocksByRange(t *testing.T) { "only 1 block in input": { timeRange: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, + {MinTime: 10, MaxTime: 20}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, + {MinTime: 10, MaxTime: 20}, }}, }, }, "only 1 block per range": { timeRange: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 15}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, + {MinTime: 10, MaxTime: 15}, + {MinTime: 40, MaxTime: 60}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 15}}, + {MinTime: 10, MaxTime: 15}, }}, {rangeStart: 40, rangeEnd: 60, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, + {MinTime: 40, MaxTime: 60}, }}, }, }, "multiple blocks per range": { timeRange: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 15}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 50, MaxTime: 55}}, + {MinTime: 10, MaxTime: 15}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 40, MaxTime: 60}, + {MinTime: 50, MaxTime: 55}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 15}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, + {MinTime: 10, MaxTime: 15}, + {MinTime: 10, MaxTime: 20}, }}, {rangeStart: 40, rangeEnd: 60, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 40, MaxTime: 60}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 50, MaxTime: 55}}, + {MinTime: 40, MaxTime: 60}, + {MinTime: 50, MaxTime: 55}, }}, }, }, "a block with time range larger then the range should be excluded": { timeRange: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, // This block is larger then the range. - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 0, MaxTime: 40}, // This block is larger then the range. + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 20, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 10, MaxTime: 20}, }}, {rangeStart: 20, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, + {MinTime: 20, MaxTime: 30}, }}, }, }, "blocks with different time ranges but all fitting within the input range": { timeRange: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 0, MaxTime: 40}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, }, expected: []blocksGroup{ {rangeStart: 0, rangeEnd: 40, blocks: []*metadata.Meta{ - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 0, MaxTime: 40}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 10, MaxTime: 20}}, - {BlockMeta: tsdb.BlockMeta{MinTime: 20, MaxTime: 30}}, + {MinTime: 0, MaxTime: 20}, + {MinTime: 0, MaxTime: 40}, + {MinTime: 10, MaxTime: 20}, + {MinTime: 20, MaxTime: 30}, }}, }, }, diff --git a/pkg/compactor/shuffle_sharding_planner_test.go b/pkg/compactor/shuffle_sharding_planner_test.go index 79c2383e013..97a711b3b39 100644 --- a/pkg/compactor/shuffle_sharding_planner_test.go +++ b/pkg/compactor/shuffle_sharding_planner_test.go @@ -12,7 +12,6 @@ import ( "github.com/oklog/ulid/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -49,18 +48,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -77,18 +72,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { }, expected: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, }, @@ -96,18 +87,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 2 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 2 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -128,18 +115,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -160,18 +143,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 0 * time.Hour.Milliseconds(), - MaxTime: 4 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 0 * time.Hour.Milliseconds(), + MaxTime: 4 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -193,25 +172,19 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { noCompactBlocks: map[ulid.ULID]*metadata.NoCompactMark{block1ulid: {}}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block3ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block3ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -233,18 +206,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { }, expected: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block3ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block3ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, }, @@ -253,18 +222,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { noCompactBlocks: map[ulid.ULID]*metadata.NoCompactMark{block1ulid: {}}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -285,18 +250,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ @@ -312,18 +273,14 @@ func TestShuffleShardingPlanner_Plan(t *testing.T) { ranges: []int64{2 * time.Hour.Milliseconds()}, blocks: []*metadata.Meta{ { - BlockMeta: tsdb.BlockMeta{ - ULID: block1ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block1ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, { - BlockMeta: tsdb.BlockMeta{ - ULID: block2ulid, - MinTime: 1 * time.Hour.Milliseconds(), - MaxTime: 2 * time.Hour.Milliseconds(), - }, + ULID: block2ulid, + MinTime: 1 * time.Hour.Milliseconds(), + MaxTime: 2 * time.Hour.Milliseconds(), }, }, visitedBlocks: []VisitedBlock{ diff --git a/pkg/cortex/runtime_config.go b/pkg/cortex/runtime_config.go index 18d62a49f07..8031b6be5c4 100644 --- a/pkg/cortex/runtime_config.go +++ b/pkg/cortex/runtime_config.go @@ -145,8 +145,8 @@ func runtimeConfigHandler(runtimeCfgManager *runtimeconfig.Manager, defaultLimit case "diff": // Default runtime config is just empty struct, but to make diff work, // we set defaultLimits for every tenant that exists in runtime config. - defaultCfg := RuntimeConfigValues{} - defaultCfg.TenantLimits = map[string]*validation.Limits{} + defaultCfg := RuntimeConfigValues{ + TenantLimits: map[string]*validation.Limits{}} for k, v := range cfg.TenantLimits { if v != nil { defaultCfg.TenantLimits[k] = &defaultLimits diff --git a/pkg/cortex/runtime_config_test.go b/pkg/cortex/runtime_config_test.go index bd2f6b22320..8194800a812 100644 --- a/pkg/cortex/runtime_config_test.go +++ b/pkg/cortex/runtime_config_test.go @@ -207,12 +207,12 @@ overrides: max_global_series_per_user: 15000 `) - loader := runtimeConfigLoader{} - loader.cfg = Config{ - Target: tc.target, - Distributor: distributor.Config{ShardByAllLabels: tc.shardByAllLabels}, - Ingester: ingester.Config{ActiveSeriesMetricsEnabled: true}, - } + loader := runtimeConfigLoader{ + cfg: Config{ + Target: tc.target, + Distributor: distributor.Config{ShardByAllLabels: tc.shardByAllLabels}, + Ingester: ingester.Config{ActiveSeriesMetricsEnabled: true}, + }} _, err := loader.load(yamlFile) if tc.isErr { diff --git a/pkg/cortexpb/compat_test.go b/pkg/cortexpb/compat_test.go index 336c8ce3fb0..64952b6b404 100644 --- a/pkg/cortexpb/compat_test.go +++ b/pkg/cortexpb/compat_test.go @@ -20,7 +20,7 @@ func TestJsoniterMarshalForSample(t *testing.T) { } func TestStdlibJsonMarshalForSample(t *testing.T) { - testMarshalling(t, json.Marshal, "json: error calling MarshalJSON for type cortexpb.Sample: test sample") + testMarshalling(t, json.Marshal, "json: error calling MarshalJSON for type *cortexpb.Sample: test sample") } func testMarshalling(t *testing.T, marshalFn func(v any) ([]byte, error), expectedError string) { diff --git a/pkg/cortexpb/cortex.pb.go b/pkg/cortexpb/cortex.pb.go index 88f24f406af..a0a8b8e37d9 100644 --- a/pkg/cortexpb/cortex.pb.go +++ b/pkg/cortexpb/cortex.pb.go @@ -1014,7 +1014,6 @@ func (m *Exemplar) GetTimestampMs() int64 { // integer histogram as well as a float histogram. type Histogram struct { // Types that are valid to be assigned to Count: - // // *Histogram_CountInt // *Histogram_CountFloat Count isHistogram_Count `protobuf_oneof:"count"` @@ -1029,7 +1028,6 @@ type Histogram struct { Schema int32 `protobuf:"zigzag32,4,opt,name=schema,proto3" json:"schema,omitempty"` ZeroThreshold float64 `protobuf:"fixed64,5,opt,name=zero_threshold,json=zeroThreshold,proto3" json:"zero_threshold,omitempty"` // Types that are valid to be assigned to ZeroCount: - // // *Histogram_ZeroCountInt // *Histogram_ZeroCountFloat ZeroCount isHistogram_ZeroCount `protobuf_oneof:"zero_count"` @@ -1369,104 +1367,104 @@ func init() { func init() { proto.RegisterFile("cortex.proto", fileDescriptor_893a47d0a749d749) } var fileDescriptor_893a47d0a749d749 = []byte{ - // 1552 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x3d, 0x6f, 0x1b, 0x47, - 0x1a, 0xe6, 0xf2, 0x9b, 0x2f, 0x3f, 0xbc, 0x1a, 0xd3, 0xf6, 0x4a, 0xb6, 0x97, 0x32, 0x8d, 0xbb, - 0x13, 0x7c, 0x86, 0xce, 0x90, 0x71, 0xbe, 0x83, 0x61, 0x1c, 0x40, 0xca, 0x94, 0x45, 0xd8, 0x24, - 0x85, 0x21, 0x25, 0xc1, 0xd7, 0x2c, 0x56, 0xe4, 0x50, 0x5c, 0x98, 0xcb, 0xdd, 0xec, 0x0c, 0x0d, - 0x2b, 0x55, 0xaa, 0xc0, 0xe9, 0xd2, 0xa4, 0x49, 0x17, 0xb8, 0x49, 0x9b, 0x3a, 0x7f, 0xc0, 0x5d, - 0xd4, 0xc5, 0x30, 0x10, 0x21, 0x96, 0x1b, 0x27, 0x95, 0x7f, 0x42, 0x30, 0xb3, 0x9f, 0x14, 0x25, - 0x38, 0x48, 0x5c, 0xa4, 0xdb, 0x79, 0x9e, 0x77, 0x66, 0x9e, 0x7d, 0x3f, 0x9e, 0x25, 0xa1, 0xd0, - 0xb7, 0x1c, 0x46, 0x9e, 0xad, 0xda, 0x8e, 0xc5, 0x2c, 0x94, 0x75, 0x57, 0xf6, 0xde, 0x52, 0x79, - 0xdf, 0xda, 0xb7, 0x04, 0xf8, 0x2f, 0xfe, 0xe4, 0xf2, 0xd5, 0x45, 0x58, 0x68, 0x11, 0x4a, 0xf5, - 0x7d, 0xb2, 0x6b, 0xb0, 0x51, 0x7d, 0x3a, 0xc4, 0x64, 0x78, 0x37, 0xf9, 0xfe, 0x9b, 0x4a, 0xac, - 0xfa, 0x45, 0x02, 0x0a, 0xbb, 0x8e, 0xc1, 0x08, 0x26, 0x9f, 0x4c, 0x09, 0x65, 0x68, 0x0b, 0x80, - 0x19, 0x26, 0xa1, 0xc4, 0x31, 0x08, 0x55, 0xa4, 0xe5, 0xc4, 0x4a, 0x7e, 0xad, 0xbc, 0xea, 0x5f, - 0xb0, 0xda, 0x33, 0x4c, 0xd2, 0x15, 0x5c, 0x7d, 0xe9, 0xe5, 0x51, 0x25, 0xf6, 0xfa, 0xa8, 0x82, - 0xb6, 0x1c, 0xa2, 0x8f, 0xc7, 0x56, 0xbf, 0x17, 0xec, 0xc3, 0x91, 0x33, 0xd0, 0x4d, 0x48, 0x77, - 0xad, 0xa9, 0xd3, 0x27, 0x4a, 0x7c, 0x59, 0x5a, 0x29, 0x45, 0x4f, 0x73, 0xf1, 0xc6, 0x64, 0x6a, - 0x62, 0x2f, 0x06, 0xdd, 0x85, 0xac, 0x49, 0x98, 0x3e, 0xd0, 0x99, 0xae, 0x24, 0xc4, 0xed, 0x4a, - 0x18, 0xdf, 0x22, 0xcc, 0x31, 0xfa, 0x2d, 0x8f, 0xaf, 0x27, 0x5f, 0x1e, 0x55, 0x24, 0x1c, 0xc4, - 0xa3, 0x7b, 0xb0, 0x44, 0x9f, 0x18, 0xb6, 0x36, 0xd6, 0xf7, 0xc8, 0x58, 0x9b, 0xe8, 0x26, 0xd1, - 0x9e, 0xea, 0x63, 0x63, 0xa0, 0x33, 0xc3, 0x9a, 0x28, 0xef, 0x32, 0xcb, 0xd2, 0x4a, 0x16, 0x5f, - 0xe2, 0x21, 0x8f, 0x78, 0x44, 0x5b, 0x37, 0xc9, 0x4e, 0xc0, 0xa3, 0x16, 0x24, 0x30, 0x19, 0x2a, - 0xbf, 0xf0, 0xb0, 0xfc, 0xda, 0xe5, 0xe8, 0xad, 0x27, 0x72, 0x57, 0xbf, 0xca, 0x5f, 0xfd, 0xf0, - 0xa8, 0x22, 0xbd, 0x3e, 0xaa, 0xcc, 0xa7, 0x16, 0xf3, 0x73, 0xd0, 0x2d, 0x28, 0x0f, 0x0c, 0xda, - 0xd7, 0x9d, 0x81, 0x66, 0x4d, 0x99, 0x66, 0x0d, 0x35, 0xcb, 0x19, 0x10, 0x47, 0xf9, 0xd5, 0x95, - 0xb1, 0xe0, 0x91, 0x9d, 0x29, 0xeb, 0x0c, 0x3b, 0x9c, 0xa9, 0x7e, 0x1f, 0x87, 0x52, 0xb4, 0x16, - 0x3b, 0x6b, 0x48, 0x81, 0x0c, 0x3d, 0x30, 0xf7, 0xac, 0x31, 0x55, 0x92, 0xcb, 0x89, 0x95, 0x1c, - 0xf6, 0x97, 0xa8, 0x37, 0x53, 0xa7, 0x94, 0xc8, 0xd4, 0xc5, 0xd3, 0xea, 0xb4, 0xb3, 0x56, 0xbf, - 0xe2, 0x55, 0xaa, 0x3c, 0x5f, 0xa9, 0x9d, 0xb5, 0x33, 0x6a, 0x95, 0xfe, 0x1d, 0xb5, 0xfa, 0x2b, - 0xe5, 0xbb, 0xfa, 0x43, 0x1c, 0x0a, 0xd1, 0xb7, 0x46, 0x15, 0xc8, 0x0b, 0x61, 0x54, 0x73, 0xc8, - 0xd0, 0x6d, 0xe5, 0x22, 0x06, 0x17, 0xc2, 0x64, 0x48, 0xd1, 0x2d, 0xc8, 0x50, 0xdd, 0xb4, 0xc7, - 0x84, 0x2a, 0x71, 0x91, 0x3f, 0x39, 0xf2, 0xb6, 0x82, 0x10, 0x1d, 0x16, 0xc3, 0x7e, 0x18, 0x6a, - 0x01, 0x8c, 0x0c, 0xca, 0xac, 0x7d, 0x47, 0x37, 0xa9, 0xd7, 0x9e, 0xe7, 0xc3, 0x4d, 0x9b, 0x3e, - 0x57, 0x57, 0xbc, 0x8c, 0xcb, 0xbb, 0x8e, 0x6e, 0xdb, 0x64, 0x10, 0x30, 0x38, 0x72, 0x00, 0xfa, - 0x2f, 0xe4, 0xc8, 0x33, 0x62, 0xda, 0x63, 0xdd, 0x71, 0xeb, 0x3b, 0x33, 0x6a, 0x0d, 0x8f, 0xda, - 0x59, 0xf3, 0x64, 0x84, 0xc1, 0xe8, 0x4e, 0x64, 0x4a, 0x52, 0x22, 0x7f, 0xe5, 0x99, 0x29, 0x11, - 0x4c, 0xb0, 0x31, 0x9c, 0x90, 0x7f, 0xc2, 0x42, 0xdf, 0x21, 0x3a, 0x23, 0x03, 0x4d, 0x54, 0x9d, - 0xe9, 0xa6, 0x2d, 0x4a, 0x9d, 0xc0, 0xb2, 0x47, 0xf4, 0x7c, 0xbc, 0xaa, 0x03, 0x84, 0x1a, 0x3e, - 0x9c, 0xce, 0x32, 0xa4, 0x9e, 0xea, 0xe3, 0xa9, 0x3b, 0xe6, 0x12, 0x76, 0x17, 0xe8, 0x0a, 0xe4, - 0xc2, 0x9b, 0x12, 0xe2, 0xa6, 0x10, 0xa8, 0xfe, 0x18, 0x07, 0x08, 0xe5, 0xa2, 0xdb, 0x90, 0x64, - 0x07, 0x36, 0x51, 0x24, 0xd1, 0x7c, 0x95, 0xd3, 0x5e, 0xc9, 0xf3, 0x80, 0xde, 0x81, 0x4d, 0xb0, - 0x08, 0x46, 0x8b, 0x90, 0x1d, 0x91, 0xb1, 0xcd, 0x65, 0x89, 0x0b, 0x8a, 0x38, 0xc3, 0xd7, 0x7c, - 0x06, 0x17, 0x21, 0x3b, 0x9d, 0x18, 0x4c, 0x50, 0x49, 0x97, 0xe2, 0x6b, 0xde, 0x2e, 0x3f, 0x49, - 0xe2, 0x66, 0xef, 0x28, 0x74, 0x19, 0x2e, 0xb5, 0x1a, 0x3d, 0xdc, 0x5c, 0xd7, 0x7a, 0x8f, 0xb7, - 0x1a, 0xda, 0x76, 0xbb, 0xbb, 0xd5, 0x58, 0x6f, 0x6e, 0x34, 0x1b, 0xf7, 0xe5, 0x18, 0xba, 0x04, - 0xe7, 0xa3, 0xe4, 0x7a, 0x67, 0xbb, 0xdd, 0x6b, 0x60, 0x59, 0x42, 0x17, 0x60, 0x21, 0x4a, 0x3c, - 0xa8, 0x6d, 0x3f, 0x68, 0xc8, 0x71, 0xb4, 0x08, 0x17, 0xa2, 0xf0, 0x66, 0xb3, 0xdb, 0xeb, 0x3c, - 0xc0, 0xb5, 0x96, 0x9c, 0x40, 0x2a, 0x2c, 0xcd, 0xed, 0x08, 0xf9, 0xe4, 0xc9, 0xab, 0xba, 0xdb, - 0xad, 0x56, 0x0d, 0x3f, 0x96, 0x53, 0xa8, 0x0c, 0x72, 0x94, 0x68, 0xb6, 0x37, 0x3a, 0x72, 0x1a, - 0x29, 0x50, 0x9e, 0x09, 0xef, 0xd5, 0x7a, 0x8d, 0x6e, 0xa3, 0x27, 0x67, 0xaa, 0xdf, 0x49, 0x80, - 0xba, 0xcc, 0x21, 0xba, 0x39, 0x63, 0xef, 0x4b, 0x90, 0xed, 0x91, 0x89, 0x3e, 0x61, 0xcd, 0xfb, - 0x22, 0xcb, 0x39, 0x1c, 0xac, 0xf9, 0x3c, 0x78, 0x61, 0xa2, 0x84, 0x33, 0x7e, 0x12, 0x3d, 0x04, - 0xfb, 0x61, 0xfe, 0x08, 0xbf, 0xfb, 0x48, 0x23, 0xfc, 0x95, 0x04, 0x45, 0xef, 0x22, 0x6a, 0x5b, - 0x13, 0x4a, 0x10, 0x82, 0x64, 0xdf, 0x1a, 0xb8, 0x0d, 0x91, 0xc2, 0xe2, 0x99, 0x7b, 0xa2, 0xe9, - 0xee, 0x17, 0x32, 0x73, 0xd8, 0x5f, 0x72, 0xa6, 0xeb, 0x0d, 0xb4, 0xdb, 0x69, 0xfe, 0x12, 0xa9, - 0x00, 0x9b, 0xe1, 0xe0, 0x26, 0x05, 0x19, 0x41, 0x78, 0x97, 0x36, 0x82, 0x49, 0x4c, 0xb9, 0x5d, - 0x1a, 0x00, 0xd5, 0xe7, 0x71, 0x80, 0xd0, 0x5a, 0x50, 0x0d, 0xd2, 0x6e, 0xdb, 0x7b, 0x9f, 0xc7, - 0x88, 0x03, 0x08, 0x9f, 0xdb, 0xd2, 0x0d, 0xa7, 0x5e, 0xf6, 0x1c, 0xa0, 0x20, 0xa0, 0xda, 0x40, - 0xb7, 0x19, 0x71, 0xb0, 0xb7, 0xf1, 0x0f, 0x58, 0xcf, 0x9d, 0xa8, 0x57, 0xb8, 0xce, 0x83, 0xe6, - 0xbd, 0x62, 0xde, 0x29, 0x66, 0x2d, 0x2b, 0xf9, 0x27, 0x2d, 0xab, 0xfa, 0x6f, 0xc8, 0x05, 0xef, - 0xc8, 0xab, 0xc3, 0x4d, 0x5f, 0x54, 0xa7, 0x80, 0xc5, 0xf3, 0xac, 0x0b, 0x14, 0x3c, 0x17, 0xa8, - 0x5a, 0x90, 0x76, 0x5f, 0x2b, 0xe4, 0xa5, 0xa8, 0x4b, 0x5c, 0x83, 0x42, 0x60, 0x0a, 0x9a, 0x49, - 0xc5, 0xe6, 0x04, 0xce, 0x07, 0x58, 0x8b, 0x7f, 0x9a, 0x10, 0x65, 0xba, 0xc3, 0xb4, 0x99, 0x40, - 0xb7, 0xce, 0xb2, 0x60, 0x7a, 0x61, 0x74, 0xf5, 0xeb, 0x38, 0x94, 0x66, 0x7f, 0x2d, 0xa0, 0xff, - 0xcc, 0x98, 0xcb, 0xf5, 0xb3, 0x7e, 0x55, 0xcc, 0x1b, 0xcc, 0x4d, 0x40, 0xa6, 0xc0, 0xb4, 0xa1, - 0x6e, 0x1a, 0xe3, 0x03, 0xf1, 0xa5, 0xf3, 0x7a, 0x4f, 0x76, 0x99, 0x0d, 0x41, 0xf0, 0x0f, 0x1c, - 0x4f, 0x0a, 0xb7, 0x1f, 0xd1, 0x64, 0x39, 0x2c, 0x9e, 0x39, 0xc6, 0x7d, 0x47, 0x74, 0x56, 0x0e, - 0x8b, 0xe7, 0xea, 0xc1, 0x8c, 0xff, 0xe4, 0x21, 0xb3, 0xdd, 0x7e, 0xd8, 0xee, 0xec, 0xb6, 0xe5, - 0x18, 0x5f, 0x84, 0x1e, 0x93, 0x83, 0x94, 0xef, 0x2b, 0x45, 0xc8, 0x45, 0xbd, 0x04, 0x41, 0x69, - 0xce, 0x3f, 0xf2, 0x90, 0x09, 0x3d, 0x23, 0x0b, 0x49, 0xcf, 0x27, 0x0a, 0x90, 0x8d, 0x78, 0xc3, - 0x43, 0x48, 0xbb, 0x57, 0x7f, 0x84, 0x56, 0xae, 0x7e, 0x2e, 0x41, 0xd6, 0x6f, 0xbf, 0x8f, 0x31, - 0x1a, 0xa7, 0x7f, 0x46, 0x4e, 0x36, 0x48, 0x62, 0xae, 0x41, 0xaa, 0x2f, 0xd2, 0x90, 0x0b, 0x9a, - 0x16, 0x5d, 0x85, 0x5c, 0xdf, 0x9a, 0x4e, 0x98, 0x66, 0x4c, 0x98, 0x28, 0x79, 0x72, 0x33, 0x86, - 0xb3, 0x02, 0x6a, 0x4e, 0x18, 0xba, 0x06, 0x79, 0x97, 0x1e, 0x8e, 0x2d, 0xdd, 0xf5, 0x3b, 0x69, - 0x33, 0x86, 0x41, 0x80, 0x1b, 0x1c, 0x43, 0x32, 0x24, 0xe8, 0xd4, 0x14, 0x37, 0x49, 0x98, 0x3f, - 0xa2, 0x8b, 0x90, 0xa6, 0xfd, 0x11, 0x31, 0x75, 0x51, 0xdc, 0x05, 0xec, 0xad, 0xd0, 0xdf, 0xa0, - 0xf4, 0x29, 0x71, 0x2c, 0x8d, 0x8d, 0x1c, 0x42, 0x47, 0xd6, 0x78, 0x20, 0x0a, 0x2d, 0xe1, 0x22, - 0x47, 0x7b, 0x3e, 0x88, 0xfe, 0xee, 0x85, 0x85, 0xba, 0xd2, 0x42, 0x97, 0x84, 0x0b, 0x1c, 0x5f, - 0xf7, 0xb5, 0xdd, 0x00, 0x39, 0x12, 0xe7, 0x0a, 0xcc, 0x08, 0x81, 0x12, 0x2e, 0x05, 0x91, 0xae, - 0xc8, 0x1a, 0x94, 0x26, 0x64, 0x5f, 0x67, 0xc6, 0x53, 0xa2, 0x51, 0x5b, 0x9f, 0x50, 0x25, 0x7b, - 0xf2, 0x77, 0x44, 0x7d, 0xda, 0x7f, 0x42, 0x58, 0xd7, 0xd6, 0x27, 0x9e, 0x3b, 0x14, 0xfd, 0x1d, - 0x1c, 0xa3, 0xe8, 0x1f, 0x70, 0x2e, 0x38, 0x62, 0x40, 0xc6, 0x4c, 0xa7, 0x4a, 0x6e, 0x39, 0xb1, - 0x82, 0x70, 0x70, 0xf2, 0x7d, 0x81, 0xce, 0x04, 0x0a, 0x6d, 0x54, 0x81, 0xe5, 0xc4, 0x8a, 0x14, - 0x06, 0x0a, 0x61, 0xdc, 0x20, 0x4b, 0xb6, 0x45, 0x8d, 0x88, 0xa8, 0xfc, 0x87, 0x45, 0xf9, 0x3b, - 0x02, 0x51, 0xc1, 0x11, 0x9e, 0xa8, 0x82, 0x2b, 0xca, 0x87, 0x43, 0x51, 0x41, 0xa0, 0x27, 0xaa, - 0xe8, 0x8a, 0xf2, 0x61, 0x4f, 0xd4, 0x3d, 0x00, 0x87, 0x50, 0xc2, 0xb4, 0x11, 0xcf, 0x7c, 0x49, - 0x98, 0xc0, 0xd5, 0x53, 0x8c, 0x70, 0x15, 0xf3, 0xa8, 0x4d, 0x63, 0xc2, 0x70, 0xce, 0xf1, 0x1f, - 0xe7, 0xfa, 0xef, 0xdc, 0xbc, 0x41, 0x5d, 0x87, 0x62, 0x7f, 0x4a, 0x99, 0x65, 0x6a, 0xa2, 0x65, - 0xa9, 0x22, 0x0b, 0x1d, 0x05, 0x17, 0xdc, 0x11, 0xd8, 0x19, 0x2e, 0xb6, 0x70, 0x86, 0x8b, 0xdd, - 0x85, 0x5c, 0xa0, 0x66, 0xd6, 0x22, 0x32, 0x90, 0x78, 0xdc, 0xe8, 0xca, 0x12, 0x4a, 0x43, 0xbc, - 0xdd, 0x91, 0xe3, 0xa1, 0x4d, 0x24, 0x96, 0x92, 0xcf, 0x5f, 0xa8, 0x52, 0x3d, 0x03, 0x29, 0x91, - 0x8f, 0x7a, 0x01, 0x20, 0x6c, 0xa7, 0xea, 0x3d, 0x80, 0x30, 0xf7, 0xbc, 0xa3, 0xad, 0xe1, 0x90, - 0x12, 0x77, 0x44, 0x16, 0xb0, 0xb7, 0xe2, 0xf8, 0x98, 0x4c, 0xf6, 0xd9, 0x48, 0x4c, 0x46, 0x11, - 0x7b, 0xab, 0x1b, 0x15, 0x80, 0xf0, 0x7f, 0x00, 0x17, 0x51, 0xdb, 0x6a, 0xca, 0x31, 0x6e, 0x34, - 0x78, 0xfb, 0x51, 0x43, 0x96, 0xea, 0xff, 0x3b, 0x7c, 0xa3, 0xc6, 0x5e, 0xbd, 0x51, 0x63, 0xef, - 0xdf, 0xa8, 0xd2, 0x67, 0xc7, 0xaa, 0xf4, 0xed, 0xb1, 0x2a, 0xbd, 0x3c, 0x56, 0xa5, 0xc3, 0x63, - 0x55, 0xfa, 0xf9, 0x58, 0x95, 0xde, 0x1d, 0xab, 0xb1, 0xf7, 0xc7, 0xaa, 0xf4, 0xe5, 0x5b, 0x35, - 0x76, 0xf8, 0x56, 0x8d, 0xbd, 0x7a, 0xab, 0xc6, 0xfe, 0x1f, 0xfc, 0x81, 0xdd, 0x4b, 0x8b, 0x7f, - 0xac, 0xb7, 0x7f, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x99, 0x5c, 0xe6, 0x17, 0xe1, 0x0e, 0x00, 0x00, + // 1548 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xbf, 0x6f, 0x1b, 0x47, + 0x16, 0xe6, 0xf2, 0x37, 0x1f, 0x7f, 0x78, 0x35, 0xa6, 0xed, 0x95, 0x6c, 0x2f, 0x65, 0x1a, 0x77, + 0x27, 0xf8, 0x0c, 0x9d, 0x21, 0xe3, 0x7c, 0x07, 0xc3, 0x38, 0x80, 0x94, 0x29, 0x8b, 0xb0, 0x49, + 0x0a, 0x43, 0x4a, 0x82, 0xaf, 0x59, 0xac, 0xc8, 0xa1, 0xb8, 0x30, 0x97, 0xbb, 0xd9, 0x19, 0x1a, + 0x56, 0xaa, 0x54, 0x81, 0xd3, 0xa5, 0x49, 0x93, 0x2e, 0x70, 0x93, 0x36, 0x75, 0xfe, 0x01, 0x77, + 0x51, 0x17, 0xc3, 0x40, 0x84, 0x58, 0x6e, 0x9c, 0x54, 0xfe, 0x13, 0x82, 0x99, 0xfd, 0x49, 0x51, + 0x82, 0x83, 0xc4, 0x45, 0xba, 0x99, 0xef, 0x7b, 0x33, 0xf3, 0xcd, 0xbc, 0xf7, 0xbe, 0x25, 0xa1, + 0xd0, 0xb7, 0x1c, 0x46, 0x9e, 0xad, 0xda, 0x8e, 0xc5, 0x2c, 0x94, 0x75, 0x67, 0xf6, 0xde, 0x52, + 0x79, 0xdf, 0xda, 0xb7, 0x04, 0xf8, 0x2f, 0x3e, 0x72, 0xf9, 0xea, 0x22, 0x2c, 0xb4, 0x08, 0xa5, + 0xfa, 0x3e, 0xd9, 0x35, 0xd8, 0xa8, 0x3e, 0x1d, 0x62, 0x32, 0xbc, 0x9b, 0x7c, 0xff, 0x4d, 0x25, + 0x56, 0xfd, 0x22, 0x01, 0x85, 0x5d, 0xc7, 0x60, 0x04, 0x93, 0x4f, 0xa6, 0x84, 0x32, 0xb4, 0x05, + 0xc0, 0x0c, 0x93, 0x50, 0xe2, 0x18, 0x84, 0x2a, 0xd2, 0x72, 0x62, 0x25, 0xbf, 0x56, 0x5e, 0xf5, + 0x0f, 0x58, 0xed, 0x19, 0x26, 0xe9, 0x0a, 0xae, 0xbe, 0xf4, 0xf2, 0xa8, 0x12, 0x7b, 0x7d, 0x54, + 0x41, 0x5b, 0x0e, 0xd1, 0xc7, 0x63, 0xab, 0xdf, 0x0b, 0xd6, 0xe1, 0xc8, 0x1e, 0xe8, 0x26, 0xa4, + 0xbb, 0xd6, 0xd4, 0xe9, 0x13, 0x25, 0xbe, 0x2c, 0xad, 0x94, 0xa2, 0xbb, 0xb9, 0x78, 0x63, 0x32, + 0x35, 0xb1, 0x17, 0x83, 0xee, 0x42, 0xd6, 0x24, 0x4c, 0x1f, 0xe8, 0x4c, 0x57, 0x12, 0xe2, 0x74, + 0x25, 0x8c, 0x6f, 0x11, 0xe6, 0x18, 0xfd, 0x96, 0xc7, 0xd7, 0x93, 0x2f, 0x8f, 0x2a, 0x12, 0x0e, + 0xe2, 0xd1, 0x3d, 0x58, 0xa2, 0x4f, 0x0c, 0x5b, 0x1b, 0xeb, 0x7b, 0x64, 0xac, 0x4d, 0x74, 0x93, + 0x68, 0x4f, 0xf5, 0xb1, 0x31, 0xd0, 0x99, 0x61, 0x4d, 0x94, 0x77, 0x99, 0x65, 0x69, 0x25, 0x8b, + 0x2f, 0xf1, 0x90, 0x47, 0x3c, 0xa2, 0xad, 0x9b, 0x64, 0x27, 0xe0, 0x51, 0x0b, 0x12, 0x98, 0x0c, + 0x95, 0x5f, 0x78, 0x58, 0x7e, 0xed, 0x72, 0xf4, 0xd4, 0x13, 0x6f, 0x57, 0xbf, 0xca, 0xaf, 0x7e, + 0x78, 0x54, 0x91, 0x5e, 0x1f, 0x55, 0xe6, 0x9f, 0x16, 0xf3, 0x7d, 0xd0, 0x2d, 0x28, 0x0f, 0x0c, + 0xda, 0xd7, 0x9d, 0x81, 0x66, 0x4d, 0x99, 0x66, 0x0d, 0x35, 0xcb, 0x19, 0x10, 0x47, 0xf9, 0xd5, + 0x95, 0xb1, 0xe0, 0x91, 0x9d, 0x29, 0xeb, 0x0c, 0x3b, 0x9c, 0xa9, 0x7e, 0x1f, 0x87, 0x52, 0x34, + 0x17, 0x3b, 0x6b, 0x48, 0x81, 0x0c, 0x3d, 0x30, 0xf7, 0xac, 0x31, 0x55, 0x92, 0xcb, 0x89, 0x95, + 0x1c, 0xf6, 0xa7, 0xa8, 0x37, 0x93, 0xa7, 0x94, 0x78, 0xa9, 0x8b, 0xa7, 0xe5, 0x69, 0x67, 0xad, + 0x7e, 0xc5, 0xcb, 0x54, 0x79, 0x3e, 0x53, 0x3b, 0x6b, 0x67, 0xe4, 0x2a, 0xfd, 0x3b, 0x72, 0xf5, + 0x57, 0x7a, 0xef, 0xea, 0x0f, 0x71, 0x28, 0x44, 0x6f, 0x8d, 0x2a, 0x90, 0x17, 0xc2, 0xa8, 0xe6, + 0x90, 0xa1, 0x5b, 0xca, 0x45, 0x0c, 0x2e, 0x84, 0xc9, 0x90, 0xa2, 0x5b, 0x90, 0xa1, 0xba, 0x69, + 0x8f, 0x09, 0x55, 0xe2, 0xe2, 0xfd, 0xe4, 0xc8, 0x6d, 0x05, 0x21, 0x2a, 0x2c, 0x86, 0xfd, 0x30, + 0xd4, 0x02, 0x18, 0x19, 0x94, 0x59, 0xfb, 0x8e, 0x6e, 0x52, 0xaf, 0x3c, 0xcf, 0x87, 0x8b, 0x36, + 0x7d, 0xae, 0xae, 0x78, 0x2f, 0x2e, 0xef, 0x3a, 0xba, 0x6d, 0x93, 0x41, 0xc0, 0xe0, 0xc8, 0x06, + 0xe8, 0xbf, 0x90, 0x23, 0xcf, 0x88, 0x69, 0x8f, 0x75, 0xc7, 0xcd, 0xef, 0x4c, 0xab, 0x35, 0x3c, + 0x6a, 0x67, 0xcd, 0x93, 0x11, 0x06, 0xa3, 0x3b, 0x91, 0x2e, 0x49, 0x2d, 0x4b, 0xb3, 0x0b, 0xfd, + 0xfe, 0x08, 0x16, 0x86, 0x1d, 0xf2, 0x4f, 0x58, 0xe8, 0x3b, 0x44, 0x67, 0x64, 0xa0, 0x89, 0xac, + 0x33, 0xdd, 0xb4, 0x45, 0xaa, 0x13, 0x58, 0xf6, 0x88, 0x9e, 0x8f, 0x57, 0x75, 0x80, 0x50, 0xc3, + 0x87, 0x9f, 0xb3, 0x0c, 0xa9, 0xa7, 0xfa, 0x78, 0xea, 0xb6, 0xb9, 0x84, 0xdd, 0x09, 0xba, 0x02, + 0xb9, 0xf0, 0xa4, 0x84, 0x38, 0x29, 0x04, 0xaa, 0x3f, 0xc6, 0x01, 0x42, 0xb9, 0xe8, 0x36, 0x24, + 0xd9, 0x81, 0x4d, 0x14, 0x49, 0x14, 0x5f, 0xe5, 0xb4, 0x2b, 0x79, 0x1e, 0xd0, 0x3b, 0xb0, 0x09, + 0x16, 0xc1, 0x68, 0x11, 0xb2, 0x23, 0x32, 0xb6, 0xb9, 0x2c, 0x71, 0x40, 0x11, 0x67, 0xf8, 0x9c, + 0xf7, 0xe0, 0x22, 0x64, 0xa7, 0x13, 0x83, 0x09, 0x2a, 0xe9, 0x52, 0x7c, 0xce, 0xcb, 0xe5, 0x27, + 0x09, 0x20, 0xdc, 0x0a, 0x5d, 0x86, 0x4b, 0xad, 0x46, 0x0f, 0x37, 0xd7, 0xb5, 0xde, 0xe3, 0xad, + 0x86, 0xb6, 0xdd, 0xee, 0x6e, 0x35, 0xd6, 0x9b, 0x1b, 0xcd, 0xc6, 0x7d, 0x39, 0x86, 0x2e, 0xc1, + 0xf9, 0x28, 0xb9, 0xde, 0xd9, 0x6e, 0xf7, 0x1a, 0x58, 0x96, 0xd0, 0x05, 0x58, 0x88, 0x12, 0x0f, + 0x6a, 0xdb, 0x0f, 0x1a, 0x72, 0x1c, 0x2d, 0xc2, 0x85, 0x28, 0xbc, 0xd9, 0xec, 0xf6, 0x3a, 0x0f, + 0x70, 0xad, 0x25, 0x27, 0x90, 0x0a, 0x4b, 0x73, 0x2b, 0x42, 0x3e, 0x79, 0xf2, 0xa8, 0xee, 0x76, + 0xab, 0x55, 0xc3, 0x8f, 0xe5, 0x14, 0x2a, 0x83, 0x1c, 0x25, 0x9a, 0xed, 0x8d, 0x8e, 0x9c, 0x46, + 0x0a, 0x94, 0x67, 0xc2, 0x7b, 0xb5, 0x5e, 0xa3, 0xdb, 0xe8, 0xc9, 0x99, 0xea, 0x77, 0x12, 0xa0, + 0x2e, 0x73, 0x88, 0x6e, 0xce, 0xd8, 0xfb, 0x12, 0x64, 0x7b, 0x64, 0xa2, 0x4f, 0x58, 0xf3, 0xbe, + 0x78, 0xe5, 0x1c, 0x0e, 0xe6, 0xbc, 0x1f, 0xbc, 0x30, 0x91, 0xc2, 0x19, 0x3f, 0x89, 0x6e, 0x82, + 0xfd, 0x30, 0xbf, 0x85, 0xdf, 0x7d, 0xa4, 0x16, 0xfe, 0x4a, 0x82, 0xa2, 0x77, 0x10, 0xb5, 0xad, + 0x09, 0x25, 0x08, 0x41, 0xb2, 0x6f, 0x0d, 0xdc, 0x82, 0x48, 0x61, 0x31, 0xe6, 0x9e, 0x68, 0xba, + 0xeb, 0x85, 0xcc, 0x1c, 0xf6, 0xa7, 0x9c, 0xe9, 0x7a, 0x0d, 0xed, 0x56, 0x9a, 0x3f, 0x45, 0x2a, + 0xc0, 0x66, 0xd8, 0xb8, 0x49, 0x41, 0x46, 0x10, 0x5e, 0xa5, 0x8d, 0xa0, 0x13, 0x53, 0x6e, 0x95, + 0x06, 0x40, 0xf5, 0x79, 0x1c, 0x20, 0xb4, 0x16, 0x54, 0x83, 0xb4, 0x5b, 0xf6, 0x8a, 0x74, 0xd2, + 0x01, 0x84, 0xcf, 0x6d, 0xe9, 0x86, 0x53, 0x2f, 0x7b, 0x0e, 0x50, 0x10, 0x50, 0x6d, 0xa0, 0xdb, + 0x8c, 0x38, 0xd8, 0x5b, 0xf8, 0x07, 0xac, 0xe7, 0x4e, 0xd4, 0x2b, 0x5c, 0xe7, 0x41, 0xf3, 0x5e, + 0x31, 0xef, 0x14, 0xb3, 0x96, 0x95, 0xfc, 0x93, 0x96, 0x55, 0xfd, 0x37, 0xe4, 0x82, 0x3b, 0xf2, + 0xec, 0x70, 0xd3, 0x17, 0xd9, 0x29, 0x60, 0x31, 0x9e, 0x75, 0x81, 0x82, 0xe7, 0x02, 0x55, 0x0b, + 0xd2, 0xee, 0xb5, 0x42, 0x5e, 0x8a, 0xba, 0xc4, 0x35, 0x28, 0x04, 0xa6, 0xa0, 0x99, 0x54, 0x2c, + 0x4e, 0xe0, 0x7c, 0x80, 0xb5, 0xf8, 0xa7, 0x09, 0x51, 0xa6, 0x3b, 0x4c, 0x9b, 0x09, 0x74, 0xf3, + 0x2c, 0x0b, 0xa6, 0x17, 0x46, 0x57, 0xbf, 0x8e, 0x43, 0x69, 0xf6, 0xd7, 0x02, 0xfa, 0xcf, 0x8c, + 0xb9, 0x5c, 0x3f, 0xeb, 0x57, 0xc5, 0xbc, 0xc1, 0xdc, 0x04, 0x64, 0x0a, 0x4c, 0x1b, 0xea, 0xa6, + 0x31, 0x3e, 0x10, 0x5f, 0x3a, 0xaf, 0xf6, 0x64, 0x97, 0xd9, 0x10, 0x04, 0xff, 0xc0, 0xf1, 0x47, + 0xe1, 0xf6, 0x23, 0x8a, 0x2c, 0x87, 0xc5, 0x98, 0x63, 0xdc, 0x77, 0x44, 0x65, 0xe5, 0xb0, 0x18, + 0x57, 0x0f, 0x66, 0xfc, 0x27, 0x0f, 0x99, 0xed, 0xf6, 0xc3, 0x76, 0x67, 0xb7, 0x2d, 0xc7, 0xf8, + 0x24, 0xf4, 0x98, 0x1c, 0xa4, 0x7c, 0x5f, 0x29, 0x42, 0x2e, 0xea, 0x25, 0x08, 0x4a, 0x73, 0xfe, + 0x91, 0x87, 0x4c, 0xe8, 0x19, 0x59, 0x48, 0x7a, 0x3e, 0x51, 0x80, 0x6c, 0xc4, 0x1b, 0x1e, 0x42, + 0xda, 0x3d, 0xfa, 0x23, 0x94, 0x72, 0xf5, 0x73, 0x09, 0xb2, 0x7e, 0xf9, 0x7d, 0x8c, 0xd6, 0x38, + 0xfd, 0x33, 0x72, 0xb2, 0x40, 0x12, 0x73, 0x05, 0x52, 0x7d, 0x91, 0x86, 0x5c, 0x50, 0xb4, 0xe8, + 0x2a, 0xe4, 0xfa, 0xd6, 0x74, 0xc2, 0x34, 0x63, 0xc2, 0x44, 0xca, 0x93, 0x9b, 0x31, 0x9c, 0x15, + 0x50, 0x73, 0xc2, 0xd0, 0x35, 0xc8, 0xbb, 0xf4, 0x70, 0x6c, 0xe9, 0xae, 0xdf, 0x49, 0x9b, 0x31, + 0x0c, 0x02, 0xdc, 0xe0, 0x18, 0x92, 0x21, 0x41, 0xa7, 0xa6, 0x38, 0x49, 0xc2, 0x7c, 0x88, 0x2e, + 0x42, 0x9a, 0xf6, 0x47, 0xc4, 0xd4, 0x45, 0x72, 0x17, 0xb0, 0x37, 0x43, 0x7f, 0x83, 0xd2, 0xa7, + 0xc4, 0xb1, 0x34, 0x36, 0x72, 0x08, 0x1d, 0x59, 0xe3, 0x81, 0x48, 0xb4, 0x84, 0x8b, 0x1c, 0xed, + 0xf9, 0x20, 0xfa, 0xbb, 0x17, 0x16, 0xea, 0x4a, 0x0b, 0x5d, 0x12, 0x2e, 0x70, 0x7c, 0xdd, 0xd7, + 0x76, 0x03, 0xe4, 0x48, 0x9c, 0x2b, 0x30, 0x23, 0x04, 0x4a, 0xb8, 0x14, 0x44, 0xba, 0x22, 0x6b, + 0x50, 0x9a, 0x90, 0x7d, 0x9d, 0x19, 0x4f, 0x89, 0x46, 0x6d, 0x7d, 0x42, 0x95, 0xec, 0xc9, 0xdf, + 0x11, 0xf5, 0x69, 0xff, 0x09, 0x61, 0x5d, 0x5b, 0x9f, 0x78, 0xee, 0x50, 0xf4, 0x57, 0x70, 0x8c, + 0xa2, 0x7f, 0xc0, 0xb9, 0x60, 0x8b, 0x01, 0x19, 0x33, 0x9d, 0x2a, 0xb9, 0xe5, 0xc4, 0x0a, 0xc2, + 0xc1, 0xce, 0xf7, 0x05, 0x3a, 0x13, 0x28, 0xb4, 0x51, 0x05, 0x96, 0x13, 0x2b, 0x52, 0x18, 0x28, + 0x84, 0x71, 0x83, 0x2c, 0xd9, 0x16, 0x35, 0x22, 0xa2, 0xf2, 0x1f, 0x16, 0xe5, 0xaf, 0x08, 0x44, + 0x05, 0x5b, 0x78, 0xa2, 0x0a, 0xae, 0x28, 0x1f, 0x0e, 0x45, 0x05, 0x81, 0x9e, 0xa8, 0xa2, 0x2b, + 0xca, 0x87, 0x3d, 0x51, 0xf7, 0x00, 0x1c, 0x42, 0x09, 0xd3, 0x46, 0xfc, 0xe5, 0x4b, 0xc2, 0x04, + 0xae, 0x9e, 0x62, 0x84, 0xab, 0x98, 0x47, 0x6d, 0x1a, 0x13, 0x86, 0x73, 0x8e, 0x3f, 0x9c, 0xab, + 0xbf, 0x73, 0xf3, 0x06, 0x75, 0x1d, 0x8a, 0xfd, 0x29, 0x65, 0x96, 0xa9, 0x89, 0x92, 0xa5, 0x8a, + 0x2c, 0x74, 0x14, 0x5c, 0x70, 0x47, 0x60, 0x67, 0xb8, 0xd8, 0xc2, 0x19, 0x2e, 0x76, 0x17, 0x72, + 0x81, 0x9a, 0x59, 0x8b, 0xc8, 0x40, 0xe2, 0x71, 0xa3, 0x2b, 0x4b, 0x28, 0x0d, 0xf1, 0x76, 0x47, + 0x8e, 0x87, 0x36, 0x91, 0x58, 0x4a, 0x3e, 0x7f, 0xa1, 0x4a, 0xf5, 0x0c, 0xa4, 0xc4, 0x7b, 0xd4, + 0x0b, 0x00, 0x61, 0x39, 0x55, 0xef, 0x01, 0x84, 0x6f, 0xcf, 0x2b, 0xda, 0x1a, 0x0e, 0x29, 0x71, + 0x5b, 0x64, 0x01, 0x7b, 0x33, 0x8e, 0x8f, 0xc9, 0x64, 0x9f, 0x8d, 0x44, 0x67, 0x14, 0xb1, 0x37, + 0xbb, 0x51, 0x01, 0x08, 0xff, 0x07, 0x70, 0x11, 0xb5, 0xad, 0xa6, 0x1c, 0xe3, 0x46, 0x83, 0xb7, + 0x1f, 0x35, 0x64, 0xa9, 0xfe, 0xbf, 0xc3, 0x37, 0x6a, 0xec, 0xd5, 0x1b, 0x35, 0xf6, 0xfe, 0x8d, + 0x2a, 0x7d, 0x76, 0xac, 0x4a, 0xdf, 0x1e, 0xab, 0xd2, 0xcb, 0x63, 0x55, 0x3a, 0x3c, 0x56, 0xa5, + 0x9f, 0x8f, 0x55, 0xe9, 0xdd, 0xb1, 0x1a, 0x7b, 0x7f, 0xac, 0x4a, 0x5f, 0xbe, 0x55, 0x63, 0x87, + 0x6f, 0xd5, 0xd8, 0xab, 0xb7, 0x6a, 0xec, 0xff, 0xc1, 0x1f, 0xd8, 0xbd, 0xb4, 0xf8, 0xc7, 0x7a, + 0xfb, 0xb7, 0x01, 0x00, 0x99, 0x5c, 0xe6, 0x17, 0xe1, 0x0e, 0x00, 0x00, } func (x SourceEnum) String() string { diff --git a/pkg/cortexpb/timeseriesv2.go b/pkg/cortexpb/timeseriesv2.go index 1d0063f6a44..0d9cf45acf1 100644 --- a/pkg/cortexpb/timeseriesv2.go +++ b/pkg/cortexpb/timeseriesv2.go @@ -37,9 +37,7 @@ var ( writeRequestPoolV2 = sync.Pool{ New: func() any { return &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Symbols: make([]string, 0, dynamicSymbolsCapacity.Load()), - }, + Symbols: make([]string, 0, dynamicSymbolsCapacity.Load()), } }, } diff --git a/pkg/cortexpb/timeseriesv2_test.go b/pkg/cortexpb/timeseriesv2_test.go index fe5eff334e7..b374eeaf1a2 100644 --- a/pkg/cortexpb/timeseriesv2_test.go +++ b/pkg/cortexpb/timeseriesv2_test.go @@ -126,9 +126,7 @@ func TestPreallocWriteRequestV2Reset(t *testing.T) { t.Run("preserves Symbols capacity", func(t *testing.T) { const symbolsCap = 100 req := &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Symbols: make([]string, 0, symbolsCap), - }, + Symbols: make([]string, 0, symbolsCap), } req.Symbols = append(req.Symbols, "a", "b", "c") @@ -144,12 +142,10 @@ func TestPreallocWriteRequestV2Reset(t *testing.T) { t.Run("clears non-Symbols WriteRequestV2 fields", func(t *testing.T) { b := []byte{1, 2, 3} req := &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Source: RULE, - SkipLabelNameValidation: true, - Timeseries: []PreallocTimeseriesV2{{TimeSeriesV2: &TimeSeriesV2{}}}, - }, - data: &b, + Source: RULE, + SkipLabelNameValidation: true, + Timeseries: []PreallocTimeseriesV2{{TimeSeriesV2: &TimeSeriesV2{}}}, + data: &b, } req.Reset() @@ -170,9 +166,7 @@ func TestPreallocWriteRequestV2Reset(t *testing.T) { require.NoError(t, err) req := &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Symbols: make([]string, 0, symbolsCount*2), - }, + Symbols: make([]string, 0, symbolsCount*2), } // Simulate Reset in util.ParseProtoReader() @@ -308,9 +302,7 @@ func BenchmarkWriteRequestV2Pool_CompareFixedSymbolCapaWithDynamic(b *testing.B) fixedPool := sync.Pool{ New: func() any { return &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Symbols: make([]string, 0, initialSymbolsCapacity), - }, + Symbols: make([]string, 0, initialSymbolsCapacity), } }, } @@ -351,9 +343,7 @@ func BenchmarkWriteRequestV2Pool_CompareFixedSymbolCapaWithDynamic(b *testing.B) fixedPool2048 := sync.Pool{ New: func() any { return &PreallocWriteRequestV2{ - WriteRequestV2: WriteRequestV2{ - Symbols: make([]string, 0, 2048), - }, + Symbols: make([]string, 0, 2048), } }, } diff --git a/pkg/distributed_execution/querierpb/querier.pb.go b/pkg/distributed_execution/querierpb/querier.pb.go index 64038392baf..35a85b55647 100644 --- a/pkg/distributed_execution/querierpb/querier.pb.go +++ b/pkg/distributed_execution/querierpb/querier.pb.go @@ -425,7 +425,7 @@ func init() { func init() { proto.RegisterFile("querier.proto", fileDescriptor_7edfe438abd6b96f) } var fileDescriptor_7edfe438abd6b96f = []byte{ - // 509 bytes of a gzipped FileDescriptorProto + // 506 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x3d, 0x8f, 0xd3, 0x40, 0x10, 0xf5, 0x9e, 0x9d, 0x9c, 0x3c, 0x49, 0x04, 0x5a, 0x02, 0xb2, 0x2c, 0x58, 0x2c, 0xd3, 0xb8, 0x72, 0x20, 0x08, 0x89, 0x6b, 0x0e, 0x11, 0xa5, 0x20, 0x02, 0x81, 0xd8, 0x93, 0x28, 0x68, 0x4e, @@ -457,7 +457,7 @@ var fileDescriptor_7edfe438abd6b96f = []byte{ 0x28, 0x57, 0x5b, 0xa2, 0xec, 0xb7, 0x04, 0x7d, 0xcd, 0x08, 0xfa, 0x91, 0x11, 0x74, 0x99, 0x11, 0xb4, 0xc9, 0x08, 0xfa, 0x9d, 0x11, 0xf4, 0x27, 0x23, 0xca, 0x3e, 0x23, 0xe8, 0xfb, 0x8e, 0x28, 0x9b, 0x1d, 0x51, 0xae, 0x76, 0x44, 0x79, 0xdf, 0xbc, 0x4e, 0xbf, 0x2b, 0xdf, 0xd4, 0xe3, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x7a, 0xce, 0x55, 0xc0, 0x03, 0x00, 0x00, + 0x03, 0x00, 0x5a, 0x7a, 0xce, 0x55, 0xc0, 0x03, 0x00, 0x00, } func (this *SeriesRequest) Equal(that interface{}) bool { diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go index edf9b750b87..a60b70bc1d2 100644 --- a/pkg/distributor/distributor.go +++ b/pkg/distributor/distributor.go @@ -1760,16 +1760,14 @@ func (d *Distributor) AllUserStats(ctx context.Context) ([]ingester.UserIDStats, response := make([]ingester.UserIDStats, 0, len(perUserTotals)) for id, stats := range perUserTotals { response = append(response, ingester.UserIDStats{ - UserID: id, - UserStats: ingester.UserStats{ - IngestionRate: stats.IngestionRate, - APIIngestionRate: stats.APIIngestionRate, - RuleIngestionRate: stats.RuleIngestionRate, - NumSeries: stats.NumSeries, - ActiveSeries: stats.ActiveSeries, - LoadedBlocks: stats.LoadedBlocks, - QueriedIngesters: stats.QueriedIngesters, - }, + UserID: id, + IngestionRate: stats.IngestionRate, + APIIngestionRate: stats.APIIngestionRate, + RuleIngestionRate: stats.RuleIngestionRate, + NumSeries: stats.NumSeries, + ActiveSeries: stats.ActiveSeries, + LoadedBlocks: stats.LoadedBlocks, + QueriedIngesters: stats.QueriedIngesters, }) } diff --git a/pkg/distributor/distributorpb/distributor.pb.go b/pkg/distributor/distributorpb/distributor.pb.go index 9711c9efe66..9a9aae45608 100644 --- a/pkg/distributor/distributorpb/distributor.pb.go +++ b/pkg/distributor/distributorpb/distributor.pb.go @@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("distributor.proto", fileDescriptor_c518e33639ca565d) } var fileDescriptor_c518e33639ca565d = []byte{ - // 212 bytes of a gzipped FileDescriptorProto + // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0xc9, 0x2c, 0x2e, 0x29, 0xca, 0x4c, 0x2a, 0x2d, 0xc9, 0x2f, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x46, 0x12, 0x92, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x8b, 0xeb, 0x83, 0x58, 0x10, 0x25, 0x52, 0x96, @@ -42,8 +42,8 @@ var fileDescriptor_c518e33639ca565d = []byte{ 0x36, 0x3c, 0x92, 0x63, 0x5c, 0xf1, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x7c, 0xf1, 0x48, 0x8e, 0xe1, 0xc3, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x8a, 0x17, 0xc9, 0x77, 0x05, - 0x49, 0x49, 0x6c, 0x60, 0x57, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x5b, 0x37, 0x6f, - 0x08, 0x01, 0x00, 0x00, + 0x49, 0x49, 0x6c, 0x60, 0x57, 0x19, 0x03, 0x06, 0x00, 0x0d, 0x5b, 0x37, 0x6f, 0x08, 0x01, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/frontend/transport/handler_test.go b/pkg/frontend/transport/handler_test.go index 2a66a7c7b06..6d1972dd24e 100644 --- a/pkg/frontend/transport/handler_test.go +++ b/pkg/frontend/transport/handler_test.go @@ -499,17 +499,15 @@ func TestReportQueryStatsFormat(t *testing.T) { }, "should include query stats": { queryStats: &querier_stats.QueryStats{ - QueryResponseSeries: 100, - Stats: querier_stats.Stats{ - WallTime: 3 * time.Second, - QueryStorageWallTime: 100 * time.Minute, - FetchedSeriesCount: 100, - FetchedChunksCount: 200, - FetchedSamplesCount: 300, - FetchedChunkBytes: 1024, - FetchedDataBytes: 2048, - SplitQueries: 10, - }, + QueryResponseSeries: 100, + WallTime: 3 * time.Second, + QueryStorageWallTime: 100 * time.Minute, + FetchedSeriesCount: 100, + FetchedChunksCount: 200, + FetchedSamplesCount: 300, + FetchedChunkBytes: 1024, + FetchedDataBytes: 2048, + SplitQueries: 10, }, expectedLog: `level=info msg="query stats" component=query-frontend method=GET path=/prometheus/api/v1/query response_time=1s query_wall_time_seconds=3 response_series_count=100 fetched_series_count=100 fetched_chunks_count=200 fetched_samples_count=300 fetched_chunks_bytes=1024 fetched_data_bytes=2048 split_queries=10 status_code=200 response_size=1000 samples_scanned=0 query_storage_wall_time_seconds=6000`, source: requestmeta.SourceAPI, @@ -559,19 +557,17 @@ func TestReportQueryStatsFormat(t *testing.T) { }, "should include query stats with store gateway stats": { queryStats: &querier_stats.QueryStats{ - QueryResponseSeries: 100, - Stats: querier_stats.Stats{ - WallTime: 3 * time.Second, - QueryStorageWallTime: 100 * time.Minute, - FetchedSeriesCount: 100, - FetchedChunksCount: 200, - FetchedSamplesCount: 300, - FetchedChunkBytes: 1024, - FetchedDataBytes: 2048, - SplitQueries: 10, - StoreGatewayTouchedPostingsCount: 20, - StoreGatewayTouchedPostingBytes: 200, - }, + QueryResponseSeries: 100, + WallTime: 3 * time.Second, + QueryStorageWallTime: 100 * time.Minute, + FetchedSeriesCount: 100, + FetchedChunksCount: 200, + FetchedSamplesCount: 300, + FetchedChunkBytes: 1024, + FetchedDataBytes: 2048, + SplitQueries: 10, + StoreGatewayTouchedPostingsCount: 20, + StoreGatewayTouchedPostingBytes: 200, }, expectedLog: `level=info msg="query stats" component=query-frontend method=GET path=/prometheus/api/v1/query response_time=1s query_wall_time_seconds=3 response_series_count=100 fetched_series_count=100 fetched_chunks_count=200 fetched_samples_count=300 fetched_chunks_bytes=1024 fetched_data_bytes=2048 split_queries=10 status_code=200 response_size=1000 samples_scanned=0 store_gateway_touched_postings_count=20 store_gateway_touched_posting_bytes=200 query_storage_wall_time_seconds=6000`, source: requestmeta.SourceAPI, @@ -660,27 +656,23 @@ func TestReportSlowQueryFormat(t *testing.T) { "should include query stats fields when set": { source: requestmeta.SourceAPI, queryStats: &querier_stats.QueryStats{ - Stats: querier_stats.Stats{ - WallTime: 3 * time.Second, - QueryStorageWallTime: 100 * time.Minute, - FetchedSeriesCount: 100, - FetchedChunksCount: 200, - FetchedSamplesCount: 300, - ScannedSamples: 400, - FetchedChunkBytes: 1024, - FetchedDataBytes: 2048, - SplitQueries: 10, - }, + WallTime: 3 * time.Second, + QueryStorageWallTime: 100 * time.Minute, + FetchedSeriesCount: 100, + FetchedChunksCount: 200, + FetchedSamplesCount: 300, + ScannedSamples: 400, + FetchedChunkBytes: 1024, + FetchedDataBytes: 2048, + SplitQueries: 10, }, expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 query_wall_time_seconds=3 query_storage_wall_time_seconds=6000 fetched_series_count=100 fetched_chunks_count=200 fetched_samples_count=300 samples_scanned=400 fetched_chunks_bytes=1024 fetched_data_bytes=2048 split_queries=10`, }, "should not include query stats fields that are zero": { source: requestmeta.SourceAPI, queryStats: &querier_stats.QueryStats{ - Stats: querier_stats.Stats{ - WallTime: 3 * time.Second, - FetchedSeriesCount: 100, - }, + WallTime: 3 * time.Second, + FetchedSeriesCount: 100, }, expectedLog: `level=info msg="slow query detected" method=GET host=localhost:8080 path=/prometheus/api/v1/query source=api time_taken_ms=1000 query_wall_time_seconds=3 fetched_series_count=100`, }, diff --git a/pkg/frontend/v1/frontend_test.go b/pkg/frontend/v1/frontend_test.go index 7ae0c97c299..481a802c377 100644 --- a/pkg/frontend/v1/frontend_test.go +++ b/pkg/frontend/v1/frontend_test.go @@ -117,7 +117,7 @@ func TestFrontendPropagateTrace(t *testing.T) { } func TestFrontendCheckReady(t *testing.T) { - limits := MockLimits{MockLimits: queue.MockLimits{MaxOutstanding: 100}} + limits := MockLimits{MaxOutstanding: 100} for _, tt := range []struct { name string connectedClients int @@ -247,7 +247,7 @@ func testFrontend(t *testing.T, config Config, handler http.Handler, test func(a httpListen, err := net.Listen("tcp", "localhost:0") require.NoError(t, err) - limits := MockLimits{MockLimits: queue.MockLimits{MaxOutstanding: 100}} + limits := MockLimits{MaxOutstanding: 100} v1, err := New(config, limits, logger, reg, transport.NewRetry(0, nil)) require.NoError(t, err) require.NotNil(t, v1) diff --git a/pkg/frontend/v1/frontendv1pb/frontend.pb.go b/pkg/frontend/v1/frontendv1pb/frontend.pb.go index 59a3faf3654..d8056389a4d 100644 --- a/pkg/frontend/v1/frontendv1pb/frontend.pb.go +++ b/pkg/frontend/v1/frontendv1pb/frontend.pb.go @@ -259,7 +259,7 @@ func init() { func init() { proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe) } var fileDescriptor_eca3873955a29cfe = []byte{ - // 508 bytes of a gzipped FileDescriptorProto + // 505 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x86, 0xbd, 0x50, 0x4a, 0x98, 0x58, 0x91, 0xb5, 0x2a, 0x28, 0x32, 0x68, 0x89, 0x2c, 0x40, 0x11, 0x07, 0x1b, 0x02, 0x12, 0x02, 0x81, 0x84, 0x42, 0x43, 0xe9, 0x05, 0xb5, 0x8e, 0xb9, 0x70, @@ -279,19 +279,19 @@ var fileDescriptor_eca3873955a29cfe = []byte{ 0xaa, 0x97, 0xdc, 0xa5, 0x3b, 0x6b, 0x82, 0xc0, 0x50, 0x2c, 0x1e, 0x9b, 0xd3, 0xe1, 0x67, 0xa0, 0xab, 0x59, 0x71, 0xc4, 0xc2, 0x98, 0xe6, 0x58, 0x37, 0x56, 0xb1, 0x54, 0xd6, 0x5d, 0xaa, 0xc5, 0x26, 0x94, 0x7c, 0xd9, 0x6f, 0x77, 0x5b, 0xc2, 0x5d, 0x73, 0x8b, 0x18, 0xf7, 0xe0, 0x8a, 0x1c, - 0x2e, 0x49, 0xca, 0x0d, 0xdd, 0x56, 0xfe, 0xb4, 0xb3, 0x6f, 0xf3, 0xe5, 0x8f, 0x9f, 0xb7, 0x9f, - 0xff, 0xb7, 0xc5, 0xf6, 0x7e, 0x42, 0xf9, 0x58, 0x76, 0x70, 0x55, 0x73, 0xeb, 0x29, 0xdc, 0x7c, - 0xcb, 0xc4, 0xe0, 0x70, 0xac, 0xf6, 0x6a, 0xf7, 0x13, 0xd1, 0x63, 0xa3, 0x70, 0xee, 0xdc, 0x22, - 0x20, 0x5a, 0x06, 0xb4, 0x08, 0xdc, 0x5a, 0x2f, 0x55, 0xcb, 0xdd, 0xbf, 0x03, 0x1b, 0x99, 0xbf, - 0xd8, 0x00, 0x3d, 0xb3, 0xe0, 0xc0, 0x6d, 0xed, 0xbf, 0x6b, 0xb5, 0x3d, 0x43, 0xc3, 0x00, 0x9b, - 0x3b, 0x2d, 0xef, 0x60, 0x77, 0xdb, 0x40, 0x8d, 0x6f, 0x08, 0x4a, 0x85, 0x97, 0x3b, 0x70, 0x75, - 0x8f, 0x33, 0x9f, 0xc6, 0x31, 0x36, 0x2f, 0xfe, 0xd2, 0xaa, 0xe5, 0xe6, 0x42, 0x6e, 0xf5, 0x91, - 0x58, 0x5a, 0x1d, 0x3d, 0x40, 0x98, 0xc2, 0xd6, 0x3a, 0x36, 0x7c, 0xf7, 0x42, 0xf9, 0x97, 0xb5, - 0xcd, 0x7b, 0xff, 0x2a, 0x53, 0x2b, 0x36, 0x9b, 0x93, 0x29, 0xd1, 0xce, 0xa6, 0x44, 0x3b, 0x9f, - 0x12, 0xf4, 0x29, 0x25, 0xe8, 0x6b, 0x4a, 0xd0, 0xf7, 0x94, 0xa0, 0x49, 0x4a, 0xd0, 0xaf, 0x94, - 0xa0, 0xdf, 0x29, 0xd1, 0xce, 0x53, 0x82, 0x3e, 0xcf, 0x88, 0x36, 0x99, 0x11, 0xed, 0x6c, 0x46, - 0xb4, 0xf7, 0xfa, 0xbc, 0xf9, 0xe9, 0xc3, 0xa8, 0xdb, 0xdd, 0x94, 0x2f, 0xfe, 0xd1, 0x9f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x34, 0x74, 0x3e, 0x36, 0x98, 0x03, 0x00, 0x00, + 0x2e, 0x49, 0xca, 0x0d, 0xdd, 0x96, 0x91, 0xdd, 0xce, 0xbe, 0xcd, 0x97, 0x3f, 0x7e, 0xde, 0x7e, + 0xfe, 0xdf, 0x16, 0xdb, 0xfb, 0x09, 0xe5, 0x63, 0xd9, 0xc1, 0x55, 0xcd, 0xad, 0xa7, 0x70, 0xf3, + 0x2d, 0x13, 0x83, 0xc3, 0xb1, 0xda, 0xab, 0xdd, 0x4f, 0x44, 0x8f, 0x8d, 0xc2, 0xb9, 0x73, 0x8b, + 0x80, 0x68, 0x19, 0xd0, 0x22, 0x70, 0x6b, 0xbd, 0x54, 0x2d, 0x77, 0xff, 0x0e, 0x6c, 0x64, 0xfe, + 0x62, 0x03, 0xf4, 0xcc, 0x82, 0x03, 0xb7, 0xb5, 0xff, 0xae, 0xd5, 0xf6, 0x0c, 0x0d, 0x03, 0x6c, + 0xee, 0xb4, 0xbc, 0x83, 0xdd, 0x6d, 0x03, 0x35, 0xbe, 0x21, 0x28, 0x15, 0x5e, 0xee, 0xc0, 0xd5, + 0x3d, 0xce, 0x7c, 0x1a, 0xc7, 0xd8, 0xbc, 0xf8, 0x4b, 0xab, 0x96, 0x9b, 0x0b, 0xb9, 0xd5, 0x47, + 0x62, 0x69, 0x75, 0xf4, 0x00, 0x61, 0x0a, 0x5b, 0xeb, 0xd8, 0xf0, 0xdd, 0x0b, 0xe5, 0x5f, 0xd6, + 0x36, 0xef, 0xfd, 0xab, 0x4c, 0xad, 0xd8, 0x6c, 0x4e, 0xa6, 0x44, 0x3b, 0x9b, 0x12, 0xed, 0x7c, + 0x4a, 0xd0, 0xa7, 0x94, 0xa0, 0xaf, 0x29, 0x41, 0xdf, 0x53, 0x82, 0x26, 0x29, 0x41, 0xbf, 0x52, + 0x82, 0x7e, 0xa7, 0x44, 0x3b, 0x4f, 0x09, 0xfa, 0x3c, 0x23, 0xda, 0x64, 0x46, 0xb4, 0xb3, 0x19, + 0xd1, 0xde, 0xeb, 0xf3, 0xe6, 0xa7, 0x0f, 0xa3, 0x6e, 0x77, 0x53, 0xbe, 0xf8, 0x47, 0x7f, 0x06, + 0x00, 0x34, 0x74, 0x3e, 0x36, 0x98, 0x03, 0x00, 0x00, } func (x Type) String() string { diff --git a/pkg/frontend/v1/queue_test.go b/pkg/frontend/v1/queue_test.go index 35d5f2010ec..b35208be260 100644 --- a/pkg/frontend/v1/queue_test.go +++ b/pkg/frontend/v1/queue_test.go @@ -17,7 +17,6 @@ import ( "github.com/cortexproject/cortex/pkg/frontend/transport" "github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb" - "github.com/cortexproject/cortex/pkg/scheduler/queue" "github.com/cortexproject/cortex/pkg/util/flagext" "github.com/cortexproject/cortex/pkg/util/services" ) @@ -25,7 +24,7 @@ import ( func setupFrontend(t *testing.T, maxOutstanding int, config Config) (*Frontend, error) { logger := log.NewNopLogger() - limits := MockLimits{Queriers: 3, MockLimits: queue.MockLimits{MaxOutstanding: maxOutstanding}} + limits := MockLimits{Queriers: 3, MaxOutstanding: maxOutstanding} frontend, err := New(config, limits, logger, nil, transport.NewRetry(0, nil)) require.NoError(t, err) diff --git a/pkg/frontend/v2/frontendv2pb/frontend.pb.go b/pkg/frontend/v2/frontendv2pb/frontend.pb.go index 451729cc6eb..b9cfffb7f41 100644 --- a/pkg/frontend/v2/frontendv2pb/frontend.pb.go +++ b/pkg/frontend/v2/frontendv2pb/frontend.pb.go @@ -127,7 +127,7 @@ func init() { func init() { proto.RegisterFile("frontend.proto", fileDescriptor_eca3873955a29cfe) } var fileDescriptor_eca3873955a29cfe = []byte{ - // 359 bytes of a gzipped FileDescriptorProto + // 356 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcd, 0x4e, 0x02, 0x31, 0x10, 0xde, 0xfa, 0x9b, 0x14, 0xe2, 0xa1, 0xfe, 0x64, 0xc3, 0xa1, 0x22, 0x27, 0x4e, 0x6d, 0x82, 0x9e, 0x8c, 0x26, 0x86, 0x18, 0xa2, 0x37, 0x59, 0x39, 0x79, 0x83, 0xa5, 0x2e, 0x3f, 0xb2, 0x2d, @@ -149,8 +149,8 @@ var fileDescriptor_eca3873955a29cfe = []byte{ 0xcb, 0xe4, 0x4e, 0xfe, 0x40, 0xd8, 0x4d, 0x05, 0xa7, 0x5c, 0x8e, 0x27, 0xd8, 0x19, 0x4f, 0xb0, 0x33, 0x9b, 0x60, 0xf0, 0x62, 0x30, 0x78, 0x33, 0x18, 0xbc, 0x1b, 0x0c, 0x62, 0x83, 0xc1, 0x97, 0xc1, 0xe0, 0xdb, 0x60, 0x67, 0x66, 0x30, 0x78, 0x9d, 0x62, 0x27, 0x9e, 0x62, 0x67, 0x3c, 0xc5, - 0xce, 0xc3, 0xda, 0x27, 0x69, 0xec, 0xa4, 0x06, 0x9d, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa4, - 0xdf, 0xd6, 0xe9, 0x4b, 0x02, 0x00, 0x00, + 0xce, 0xc3, 0xda, 0x27, 0x69, 0xec, 0xa4, 0x06, 0x9d, 0xfe, 0x0c, 0x00, 0xa4, 0xdf, 0xd6, 0xe9, + 0x4b, 0x02, 0x00, 0x00, } func (this *QueryResultRequest) Equal(that interface{}) bool { diff --git a/pkg/ha/ha_tracker.pb.go b/pkg/ha/ha_tracker.pb.go index 3599e3e3a0e..15e258e08a8 100644 --- a/pkg/ha/ha_tracker.pb.go +++ b/pkg/ha/ha_tracker.pb.go @@ -96,7 +96,7 @@ func init() { func init() { proto.RegisterFile("ha_tracker.proto", fileDescriptor_86f0e7bcf71d860b) } var fileDescriptor_86f0e7bcf71d860b = []byte{ - // 197 bytes of a gzipped FileDescriptorProto + // 194 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc8, 0x48, 0x8c, 0x2f, 0x29, 0x4a, 0x4c, 0xce, 0x4e, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xca, 0x48, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x73, 0xf5, 0x41, 0x2c, 0x88, 0x8c, 0x52, 0x3a, 0x17, @@ -108,8 +108,8 @@ var fileDescriptor_86f0e7bcf71d860b = []byte{ 0x1e, 0xca, 0x31, 0x7c, 0x78, 0x28, 0xc7, 0xd8, 0xf0, 0x48, 0x8e, 0x71, 0xc5, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0xf1, 0xc5, 0x23, 0x39, 0x86, 0x0f, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x24, 0x36, 0xb0, 0x2b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x1b, 0xc6, - 0x42, 0xd3, 0x00, 0x00, 0x00, + 0x39, 0x86, 0x24, 0x36, 0xb0, 0x2b, 0x8d, 0x01, 0x03, 0x00, 0xb4, 0x1b, 0xc6, 0x42, 0xd3, 0x00, + 0x00, 0x00, } func (this *ReplicaDesc) Equal(that interface{}) bool { diff --git a/pkg/ingester/client/ingester.pb.go b/pkg/ingester/client/ingester.pb.go index 6976ae7ed45..d33b2a86478 100644 --- a/pkg/ingester/client/ingester.pb.go +++ b/pkg/ingester/client/ingester.pb.go @@ -1509,97 +1509,97 @@ func init() { func init() { proto.RegisterFile("ingester.proto", fileDescriptor_60f6df4f3586b478) } var fileDescriptor_60f6df4f3586b478 = []byte{ - // 1439 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x73, 0x13, 0x47, - 0x10, 0xd6, 0xea, 0x65, 0xa9, 0xf5, 0x40, 0x1e, 0x1b, 0x2c, 0x44, 0x58, 0xc1, 0x52, 0x24, 0xaa, - 0x24, 0xc8, 0xe0, 0x24, 0x55, 0x90, 0x07, 0x94, 0x05, 0x06, 0x0c, 0x18, 0xc3, 0xda, 0x40, 0x2a, - 0x95, 0xd4, 0xd6, 0x5a, 0x1a, 0xcb, 0x1b, 0x76, 0xb5, 0xcb, 0xce, 0x88, 0x02, 0x4e, 0x49, 0xe5, - 0x07, 0x24, 0x87, 0xfc, 0x81, 0xdc, 0x72, 0x4d, 0x55, 0x7e, 0x04, 0x47, 0x1f, 0x72, 0xa0, 0x38, - 0xb8, 0x82, 0xb8, 0x24, 0x37, 0xf2, 0x0f, 0x52, 0x3b, 0x33, 0xfb, 0xb4, 0xfc, 0x20, 0x05, 0xb9, - 0x69, 0xbb, 0xbf, 0xe9, 0xe9, 0xfe, 0xe6, 0x9b, 0xe9, 0xb6, 0xa1, 0x6a, 0x0c, 0xfa, 0x98, 0x50, - 0xec, 0xb6, 0x1d, 0xd7, 0xa6, 0x36, 0xca, 0x77, 0x6d, 0x97, 0xe2, 0x47, 0x8d, 0xe9, 0xbe, 0xdd, - 0xb7, 0x99, 0x69, 0xd6, 0xfb, 0xc5, 0xbd, 0x8d, 0x73, 0x7d, 0x83, 0x6e, 0x0c, 0xd7, 0xda, 0x5d, - 0xdb, 0x9a, 0xe5, 0x40, 0xc7, 0xb5, 0xbf, 0xc5, 0x5d, 0x2a, 0xbe, 0x66, 0x9d, 0xfb, 0x7d, 0xdf, - 0xb1, 0x26, 0x7e, 0xf0, 0xa5, 0xca, 0x17, 0x50, 0x52, 0xb1, 0xde, 0x53, 0xf1, 0x83, 0x21, 0x26, - 0x14, 0xb5, 0x61, 0xe2, 0xc1, 0x10, 0xbb, 0x06, 0x26, 0x75, 0xe9, 0x58, 0xa6, 0x55, 0x9a, 0x9b, - 0x6e, 0x0b, 0xf8, 0xed, 0x21, 0x76, 0x1f, 0x0b, 0x98, 0xea, 0x83, 0x94, 0x0b, 0x50, 0xe6, 0xcb, - 0x89, 0x63, 0x0f, 0x08, 0x46, 0xb3, 0x30, 0xe1, 0x62, 0x32, 0x34, 0xa9, 0xbf, 0xfe, 0x60, 0x62, - 0x3d, 0xc7, 0xa9, 0x3e, 0x4a, 0xb9, 0x0e, 0x95, 0x98, 0x07, 0x7d, 0x0a, 0x40, 0x0d, 0x0b, 0x93, - 0x71, 0x49, 0x38, 0x6b, 0xed, 0x55, 0xc3, 0xc2, 0x2b, 0xcc, 0xd7, 0xc9, 0x3e, 0xdd, 0x6a, 0xa6, - 0xd4, 0x08, 0x5a, 0xf9, 0x39, 0x0d, 0xe5, 0x68, 0x9e, 0xe8, 0x43, 0x40, 0x84, 0xea, 0x2e, 0xd5, - 0x18, 0x88, 0xea, 0x96, 0xa3, 0x59, 0x5e, 0x50, 0xa9, 0x95, 0x51, 0x6b, 0xcc, 0xb3, 0xea, 0x3b, - 0x96, 0x08, 0x6a, 0x41, 0x0d, 0x0f, 0x7a, 0x71, 0x6c, 0x9a, 0x61, 0xab, 0x78, 0xd0, 0x8b, 0x22, - 0x4f, 0x43, 0xc1, 0xd2, 0x69, 0x77, 0x03, 0xbb, 0xa4, 0x9e, 0x89, 0xf3, 0x74, 0x43, 0x5f, 0xc3, - 0xe6, 0x12, 0x77, 0xaa, 0x01, 0x0a, 0x3d, 0x81, 0x8c, 0x8a, 0xd7, 0xeb, 0x7f, 0x4f, 0x1c, 0x93, - 0x5a, 0xa5, 0xb9, 0x23, 0x61, 0x41, 0x4b, 0x98, 0x10, 0xbd, 0x8f, 0xef, 0x19, 0x74, 0xa3, 0x33, - 0x5c, 0x57, 0xf1, 0x7a, 0xe7, 0x9a, 0x57, 0xd7, 0xe6, 0x56, 0x53, 0x7a, 0xbe, 0xd5, 0x3c, 0xff, - 0x3a, 0x27, 0xbb, 0x3d, 0x96, 0xea, 0x6d, 0xaa, 0xfc, 0x22, 0xc1, 0xf4, 0xc2, 0x23, 0x6c, 0x39, - 0xa6, 0xee, 0xfe, 0x2f, 0xf4, 0x9c, 0xd9, 0x46, 0xcf, 0xc1, 0x71, 0xf4, 0x90, 0x90, 0x1f, 0xe5, - 0x6b, 0x98, 0x62, 0xa9, 0xad, 0x50, 0x17, 0xeb, 0x56, 0xa0, 0x86, 0x0b, 0x50, 0xea, 0x6e, 0x0c, - 0x07, 0xf7, 0x63, 0x72, 0x98, 0xf1, 0x83, 0x85, 0x62, 0xb8, 0xe8, 0x81, 0x84, 0x22, 0xa2, 0x2b, - 0xae, 0x65, 0x0b, 0xe9, 0x5a, 0x46, 0x59, 0x81, 0x83, 0x09, 0x02, 0xde, 0x80, 0xda, 0xfe, 0x90, - 0x00, 0xb1, 0x72, 0xee, 0xea, 0xe6, 0x10, 0x13, 0x9f, 0xd4, 0xa3, 0x00, 0xa6, 0x67, 0xd5, 0x06, - 0xba, 0x85, 0x19, 0x99, 0x45, 0xb5, 0xc8, 0x2c, 0x37, 0x75, 0x0b, 0xef, 0xc0, 0x79, 0xfa, 0x35, - 0x38, 0xcf, 0xec, 0xc9, 0x79, 0x96, 0x89, 0x6c, 0x2f, 0xce, 0xd1, 0x34, 0xe4, 0x4c, 0xc3, 0x32, - 0x68, 0x3d, 0xc7, 0x22, 0xf2, 0x0f, 0xe5, 0x2c, 0x4c, 0xc5, 0xaa, 0x12, 0x4c, 0x1d, 0x87, 0x32, - 0x2f, 0xeb, 0x21, 0xb3, 0x33, 0xae, 0x8a, 0x6a, 0xc9, 0x0c, 0xa1, 0xca, 0x79, 0x38, 0x1c, 0x59, - 0x99, 0x38, 0xc9, 0x7d, 0xac, 0xff, 0x5d, 0x82, 0xc9, 0x1b, 0x3e, 0x51, 0xe4, 0x6d, 0x8b, 0x34, - 0xa8, 0x3e, 0x13, 0xa9, 0xfe, 0x3f, 0xd0, 0xa8, 0x7c, 0x22, 0x64, 0x20, 0xb2, 0x16, 0xf5, 0x36, - 0xa1, 0x14, 0xca, 0xc0, 0x2f, 0x17, 0x02, 0x1d, 0x10, 0xe5, 0x33, 0xa8, 0x87, 0xcb, 0x12, 0x64, - 0xed, 0xb9, 0x18, 0x41, 0xed, 0x0e, 0xc1, 0xee, 0x0a, 0xd5, 0xa9, 0x4f, 0x94, 0xf2, 0x7d, 0x1a, - 0x26, 0x23, 0x46, 0x11, 0xea, 0xa4, 0xdf, 0x4b, 0x0c, 0x7b, 0xa0, 0xb9, 0x3a, 0xe5, 0x92, 0x94, - 0xd4, 0x4a, 0x60, 0x55, 0x75, 0x8a, 0x3d, 0xd5, 0x0e, 0x86, 0x96, 0x26, 0x2e, 0x82, 0xc7, 0x58, - 0x56, 0x2d, 0x0e, 0x86, 0x16, 0x57, 0xbf, 0x77, 0x08, 0xba, 0x63, 0x68, 0x89, 0x48, 0x19, 0x16, - 0xa9, 0xa6, 0x3b, 0xc6, 0x62, 0x2c, 0x58, 0x1b, 0xa6, 0xdc, 0xa1, 0x89, 0x93, 0xf0, 0x2c, 0x83, - 0x4f, 0x7a, 0xae, 0x38, 0xfe, 0x04, 0x54, 0xf4, 0x2e, 0x35, 0x1e, 0x62, 0x7f, 0xff, 0x1c, 0xdb, - 0xbf, 0xcc, 0x8d, 0x22, 0x85, 0x13, 0x50, 0x31, 0x6d, 0xbd, 0x87, 0x7b, 0xda, 0x9a, 0x69, 0x77, - 0xef, 0x93, 0x7a, 0x9e, 0x83, 0xb8, 0xb1, 0xc3, 0x6c, 0xca, 0x37, 0x30, 0xe5, 0x51, 0xb0, 0x78, - 0x29, 0x4e, 0xc2, 0x0c, 0x4c, 0x0c, 0x09, 0x76, 0x35, 0xa3, 0x27, 0x2e, 0x64, 0xde, 0xfb, 0x5c, - 0xec, 0xa1, 0x53, 0x90, 0xed, 0xe9, 0x54, 0x67, 0x05, 0x97, 0xe6, 0x0e, 0xfb, 0x47, 0xbd, 0x8d, - 0x46, 0x95, 0xc1, 0x94, 0x2b, 0x80, 0x3c, 0x17, 0x89, 0x47, 0x3f, 0x03, 0x39, 0xe2, 0x19, 0xc4, - 0xfb, 0x71, 0x24, 0x1a, 0x25, 0x91, 0x89, 0xca, 0x91, 0xca, 0x53, 0x09, 0xe4, 0x25, 0x4c, 0x5d, - 0xa3, 0x4b, 0x2e, 0xdb, 0x6e, 0x5c, 0x59, 0x6f, 0x59, 0xf7, 0x67, 0xa1, 0xec, 0x4b, 0x57, 0x23, - 0x98, 0xee, 0xfe, 0x40, 0x97, 0x7c, 0xe8, 0x0a, 0xa6, 0xe1, 0x8d, 0xc9, 0x46, 0xdf, 0x8b, 0xeb, - 0xd0, 0xdc, 0xb1, 0x12, 0x41, 0x50, 0x0b, 0xf2, 0x16, 0x83, 0x08, 0x86, 0x6a, 0xd1, 0xf6, 0xe7, - 0xd9, 0x55, 0xe1, 0x57, 0x6e, 0xc3, 0xc9, 0x1d, 0x82, 0x25, 0x6e, 0xc8, 0xfe, 0x43, 0x3a, 0x70, - 0x48, 0x84, 0x5c, 0xc2, 0x54, 0xf7, 0x8e, 0xd1, 0x67, 0x38, 0xa8, 0x47, 0x8a, 0xbe, 0x00, 0x2d, - 0xa8, 0xb1, 0x1f, 0x9a, 0x83, 0x5d, 0x4d, 0xec, 0x21, 0x98, 0x64, 0xf6, 0x5b, 0xd8, 0xe5, 0xf1, - 0xd0, 0xa1, 0x20, 0x87, 0x0c, 0x17, 0x95, 0xd8, 0x71, 0x19, 0x66, 0xb6, 0xed, 0x28, 0xd2, 0xfe, - 0x18, 0x0a, 0x96, 0xb0, 0x89, 0xc4, 0xeb, 0xc9, 0xc4, 0x83, 0x35, 0x01, 0x52, 0xf9, 0x47, 0x82, - 0x03, 0x89, 0x5e, 0xe7, 0xa5, 0xb9, 0xee, 0xda, 0x96, 0xe6, 0x0f, 0x8a, 0xa1, 0xb6, 0xab, 0x9e, - 0x7d, 0x51, 0x98, 0x17, 0x7b, 0x51, 0xf1, 0xa7, 0x63, 0xe2, 0x1f, 0x40, 0x9e, 0x3d, 0x29, 0x7e, - 0x93, 0x9e, 0x0a, 0x53, 0x61, 0xd4, 0xdf, 0xd2, 0x0d, 0xb7, 0x33, 0xef, 0xf5, 0xbd, 0xe7, 0x5b, - 0xcd, 0xd7, 0x9a, 0x31, 0xf9, 0xfa, 0xf9, 0x9e, 0xee, 0x50, 0xec, 0xaa, 0x62, 0x17, 0xf4, 0x01, - 0xe4, 0x79, 0x6b, 0xae, 0x67, 0xd9, 0x7e, 0x15, 0x5f, 0x73, 0xd1, 0xee, 0x2d, 0x20, 0xca, 0x8f, - 0x12, 0xe4, 0x78, 0xa5, 0x6f, 0xeb, 0x22, 0x34, 0xa0, 0x80, 0x07, 0x5d, 0xbb, 0x67, 0x0c, 0xfa, - 0xec, 0x00, 0x73, 0x6a, 0xf0, 0x8d, 0x90, 0x78, 0x17, 0x3c, 0xa5, 0x97, 0xc5, 0xe5, 0x9f, 0x87, - 0x4a, 0x4c, 0x91, 0xb1, 0x29, 0x50, 0xda, 0xcf, 0x14, 0xa8, 0x68, 0x50, 0x8e, 0x7a, 0xd0, 0x49, - 0xc8, 0xd2, 0xc7, 0x0e, 0x7f, 0x92, 0xab, 0x73, 0x93, 0xfe, 0x6a, 0xe6, 0x5e, 0x7d, 0xec, 0x60, - 0x95, 0xb9, 0xbd, 0x6c, 0xd8, 0x30, 0xc1, 0x8f, 0x8f, 0xfd, 0xf6, 0xc4, 0xcb, 0x3a, 0xa9, 0xd0, - 0x1e, 0xff, 0x50, 0x7e, 0x90, 0xa0, 0x1a, 0x2a, 0xe5, 0xb2, 0x61, 0xe2, 0x37, 0x21, 0x94, 0x06, - 0x14, 0xd6, 0x0d, 0x13, 0xb3, 0x1c, 0xf8, 0x76, 0xc1, 0xf7, 0x38, 0xa6, 0xde, 0xbf, 0x06, 0xc5, - 0xa0, 0x04, 0x54, 0x84, 0xdc, 0xc2, 0xed, 0x3b, 0xf3, 0x37, 0x6a, 0x29, 0x54, 0x81, 0xe2, 0xcd, - 0xe5, 0x55, 0x8d, 0x7f, 0x4a, 0xe8, 0x00, 0x94, 0xd4, 0x85, 0x2b, 0x0b, 0x5f, 0x6a, 0x4b, 0xf3, - 0xab, 0x17, 0xaf, 0xd6, 0xd2, 0x08, 0x41, 0x95, 0x1b, 0x6e, 0x2e, 0x0b, 0x5b, 0x66, 0xee, 0xb7, - 0x02, 0x14, 0xfc, 0x1c, 0xd1, 0x39, 0xc8, 0xde, 0x1a, 0x92, 0x0d, 0x74, 0x28, 0x54, 0xea, 0x3d, - 0xd7, 0xa0, 0x58, 0xdc, 0xe8, 0xc6, 0xcc, 0x36, 0x3b, 0xbf, 0x77, 0x4a, 0x0a, 0x2d, 0x02, 0x78, - 0x4b, 0xf9, 0x33, 0x82, 0xde, 0x09, 0x81, 0xdc, 0xb2, 0xcf, 0x30, 0x2d, 0xe9, 0xb4, 0x84, 0x2e, - 0x41, 0x29, 0x32, 0xab, 0xa2, 0xb1, 0x7f, 0x22, 0x35, 0x8e, 0xc4, 0xac, 0xf1, 0xd7, 0x4b, 0x49, - 0x9d, 0x96, 0xd0, 0x32, 0x54, 0x99, 0xcb, 0x1f, 0x4c, 0x49, 0x90, 0x54, 0x7b, 0xdc, 0xb0, 0xde, - 0x38, 0xba, 0x83, 0x37, 0xa8, 0xf0, 0x2a, 0x94, 0x22, 0xe3, 0x17, 0x6a, 0xc4, 0xb4, 0x18, 0x9b, - 0x51, 0xc3, 0xe4, 0xc6, 0x4c, 0x7a, 0x4a, 0x0a, 0xdd, 0x15, 0x73, 0x58, 0x74, 0x90, 0xdb, 0x35, - 0xde, 0xf1, 0x31, 0xbe, 0x31, 0x25, 0x2f, 0x00, 0x84, 0x23, 0x0f, 0x3a, 0x1c, 0x5b, 0x14, 0x9d, - 0xf9, 0x1a, 0x8d, 0x71, 0xae, 0x20, 0xbd, 0x15, 0xa8, 0x25, 0x27, 0xa7, 0xdd, 0x82, 0x1d, 0xdb, - 0xee, 0x1a, 0x93, 0x5b, 0x07, 0x8a, 0x41, 0xd7, 0x47, 0xf5, 0x31, 0x83, 0x00, 0x0f, 0xb6, 0xf3, - 0x88, 0xa0, 0xa4, 0xd0, 0x65, 0x28, 0xcf, 0x9b, 0xe6, 0x7e, 0xc2, 0x34, 0xa2, 0x1e, 0x92, 0x8c, - 0x63, 0x06, 0x0d, 0x24, 0xd9, 0x05, 0xd1, 0xbb, 0xc1, 0x1b, 0xb1, 0xeb, 0xf4, 0xd0, 0x78, 0x6f, - 0x4f, 0x5c, 0xb0, 0xdb, 0x13, 0x38, 0xba, 0x6b, 0xcf, 0xdd, 0xf7, 0x9e, 0xa7, 0xf6, 0xc0, 0x8d, - 0x61, 0x7d, 0x15, 0x0e, 0x24, 0x5a, 0x25, 0x92, 0x13, 0x51, 0x12, 0x5d, 0xbb, 0xd1, 0xdc, 0xd1, - 0xef, 0xc7, 0xed, 0x7c, 0xbe, 0xf9, 0x42, 0x4e, 0x3d, 0x7b, 0x21, 0xa7, 0x5e, 0xbd, 0x90, 0xa5, - 0xef, 0x46, 0xb2, 0xf4, 0xeb, 0x48, 0x96, 0x9e, 0x8e, 0x64, 0x69, 0x73, 0x24, 0x4b, 0x7f, 0x8e, - 0x64, 0xe9, 0xaf, 0x91, 0x9c, 0x7a, 0x35, 0x92, 0xa5, 0x9f, 0x5e, 0xca, 0xa9, 0xcd, 0x97, 0x72, - 0xea, 0xd9, 0x4b, 0x39, 0xf5, 0x55, 0xbe, 0x6b, 0x1a, 0x78, 0x40, 0xd7, 0xf2, 0xec, 0x3f, 0x23, - 0x1f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x76, 0xeb, 0xb3, 0x84, 0x11, 0x00, 0x00, + // 1434 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x72, 0x13, 0x47, + 0x10, 0xd6, 0x5a, 0x3f, 0x96, 0x5a, 0x3f, 0xc8, 0x63, 0x83, 0xc5, 0x3a, 0xac, 0xcc, 0x52, 0x24, + 0xaa, 0x24, 0xc8, 0xe0, 0x24, 0x55, 0x90, 0x1f, 0x28, 0x0b, 0x0c, 0x18, 0x30, 0x86, 0xb5, 0x81, + 0x54, 0x2a, 0xa9, 0xad, 0xb5, 0x34, 0x96, 0x37, 0xec, 0x6a, 0x97, 0xdd, 0x11, 0x05, 0x9c, 0x92, + 0xca, 0x03, 0x24, 0x87, 0xbc, 0x40, 0x6e, 0xb9, 0xa6, 0x2a, 0x0f, 0xc1, 0xd1, 0x87, 0x1c, 0x28, + 0x0e, 0xae, 0x20, 0x2e, 0xc9, 0x8d, 0xbc, 0x41, 0x6a, 0x67, 0x66, 0x7f, 0x2d, 0xd9, 0x22, 0x05, + 0xb9, 0x69, 0xbb, 0xbf, 0xee, 0xe9, 0xfe, 0xe6, 0x9b, 0x99, 0xb6, 0xa1, 0xa2, 0xf7, 0xba, 0xd8, + 0x25, 0xd8, 0x69, 0xda, 0x8e, 0x45, 0x2c, 0x94, 0x6b, 0x5b, 0x0e, 0xc1, 0x8f, 0xc4, 0x99, 0xae, + 0xd5, 0xb5, 0xa8, 0x69, 0xc1, 0xfb, 0xc5, 0xbc, 0xe2, 0xb9, 0xae, 0x4e, 0xb6, 0xfb, 0x9b, 0xcd, + 0xb6, 0x65, 0x2e, 0x30, 0xa0, 0xed, 0x58, 0xdf, 0xe2, 0x36, 0xe1, 0x5f, 0x0b, 0xf6, 0xfd, 0xae, + 0xef, 0xd8, 0xe4, 0x3f, 0x58, 0xa8, 0xfc, 0x05, 0x14, 0x15, 0xac, 0x75, 0x14, 0xfc, 0xa0, 0x8f, + 0x5d, 0x82, 0x9a, 0x30, 0xf9, 0xa0, 0x8f, 0x1d, 0x1d, 0xbb, 0x35, 0x61, 0x3e, 0xdd, 0x28, 0x2e, + 0xce, 0x34, 0x39, 0xfc, 0x76, 0x1f, 0x3b, 0x8f, 0x39, 0x4c, 0xf1, 0x41, 0xf2, 0x05, 0x28, 0xb1, + 0x70, 0xd7, 0xb6, 0x7a, 0x2e, 0x46, 0x0b, 0x30, 0xe9, 0x60, 0xb7, 0x6f, 0x10, 0x3f, 0xfe, 0x70, + 0x22, 0x9e, 0xe1, 0x14, 0x1f, 0x25, 0x5f, 0x87, 0x72, 0xcc, 0x83, 0x3e, 0x05, 0x20, 0xba, 0x89, + 0xdd, 0x61, 0x45, 0xd8, 0x9b, 0xcd, 0x0d, 0xdd, 0xc4, 0xeb, 0xd4, 0xd7, 0xca, 0x3c, 0xdd, 0xad, + 0xa7, 0x94, 0x08, 0x5a, 0xfe, 0x79, 0x02, 0x4a, 0xd1, 0x3a, 0xd1, 0x87, 0x80, 0x5c, 0xa2, 0x39, + 0x44, 0xa5, 0x20, 0xa2, 0x99, 0xb6, 0x6a, 0x7a, 0x49, 0x85, 0x46, 0x5a, 0xa9, 0x52, 0xcf, 0x86, + 0xef, 0x58, 0x75, 0x51, 0x03, 0xaa, 0xb8, 0xd7, 0x89, 0x63, 0x27, 0x28, 0xb6, 0x82, 0x7b, 0x9d, + 0x28, 0xf2, 0x34, 0xe4, 0x4d, 0x8d, 0xb4, 0xb7, 0xb1, 0xe3, 0xd6, 0xd2, 0x71, 0x9e, 0x6e, 0x68, + 0x9b, 0xd8, 0x58, 0x65, 0x4e, 0x25, 0x40, 0xa1, 0x27, 0x90, 0x56, 0xf0, 0x56, 0xed, 0xef, 0xc9, + 0x79, 0xa1, 0x51, 0x5c, 0x9c, 0x0b, 0x1b, 0x5a, 0xc5, 0xae, 0xab, 0x75, 0xf1, 0x3d, 0x9d, 0x6c, + 0xb7, 0xfa, 0x5b, 0x0a, 0xde, 0x6a, 0x5d, 0xf3, 0xfa, 0xda, 0xd9, 0xad, 0x0b, 0xcf, 0x77, 0xeb, + 0xe7, 0x5f, 0x67, 0x67, 0xf7, 0xe6, 0x52, 0xbc, 0x45, 0xe5, 0x5f, 0x04, 0x98, 0x59, 0x7e, 0x84, + 0x4d, 0xdb, 0xd0, 0x9c, 0xff, 0x85, 0x9e, 0x33, 0x7b, 0xe8, 0x39, 0x3c, 0x8c, 0x1e, 0x37, 0xe4, + 0x47, 0xfe, 0x1a, 0xa6, 0x69, 0x69, 0xeb, 0xc4, 0xc1, 0x9a, 0x19, 0xa8, 0xe1, 0x02, 0x14, 0xdb, + 0xdb, 0xfd, 0xde, 0xfd, 0x98, 0x1c, 0x66, 0xfd, 0x64, 0xa1, 0x18, 0x2e, 0x7a, 0x20, 0xae, 0x88, + 0x68, 0xc4, 0xb5, 0x4c, 0x7e, 0xa2, 0x9a, 0x96, 0xd7, 0xe1, 0x70, 0x82, 0x80, 0x37, 0xa0, 0xb6, + 0x3f, 0x04, 0x40, 0xb4, 0x9d, 0xbb, 0x9a, 0xd1, 0xc7, 0xae, 0x4f, 0xea, 0x31, 0x00, 0xc3, 0xb3, + 0xaa, 0x3d, 0xcd, 0xc4, 0x94, 0xcc, 0x82, 0x52, 0xa0, 0x96, 0x9b, 0x9a, 0x89, 0x47, 0x70, 0x3e, + 0xf1, 0x1a, 0x9c, 0xa7, 0x0f, 0xe4, 0x3c, 0x33, 0x2f, 0x8c, 0xc1, 0x39, 0x9a, 0x81, 0xac, 0xa1, + 0x9b, 0x3a, 0xa9, 0x65, 0x69, 0x46, 0xf6, 0x21, 0x9f, 0x85, 0xe9, 0x58, 0x57, 0x9c, 0xa9, 0xe3, + 0x50, 0x62, 0x6d, 0x3d, 0xa4, 0x76, 0xca, 0x55, 0x41, 0x29, 0x1a, 0x21, 0x54, 0x3e, 0x0f, 0x47, + 0x23, 0x91, 0x89, 0x9d, 0x1c, 0x23, 0xfe, 0x77, 0x01, 0xa6, 0x6e, 0xf8, 0x44, 0xb9, 0x6f, 0x5b, + 0xa4, 0x41, 0xf7, 0xe9, 0x48, 0xf7, 0xff, 0x81, 0x46, 0xf9, 0x13, 0x40, 0xd1, 0xaa, 0x79, 0xbf, + 0x75, 0x28, 0x86, 0x32, 0xf0, 0xdb, 0x85, 0x40, 0x07, 0xae, 0xfc, 0x19, 0xd4, 0xc2, 0xb0, 0x04, + 0x59, 0x07, 0x06, 0x23, 0xa8, 0xde, 0x71, 0xb1, 0xb3, 0x4e, 0x34, 0xe2, 0x13, 0x25, 0x7f, 0x3f, + 0x01, 0x53, 0x11, 0x23, 0x4f, 0x75, 0xd2, 0x7f, 0x4b, 0x74, 0xab, 0xa7, 0x3a, 0x1a, 0x61, 0x92, + 0x14, 0x94, 0x72, 0x60, 0x55, 0x34, 0x82, 0x3d, 0xd5, 0xf6, 0xfa, 0xa6, 0xca, 0x0f, 0x82, 0xc7, + 0x58, 0x46, 0x29, 0xf4, 0xfa, 0x26, 0x53, 0xbf, 0xb7, 0x09, 0x9a, 0xad, 0xab, 0x89, 0x4c, 0x69, + 0x9a, 0xa9, 0xaa, 0xd9, 0xfa, 0x4a, 0x2c, 0x59, 0x13, 0xa6, 0x9d, 0xbe, 0x81, 0x93, 0xf0, 0x0c, + 0x85, 0x4f, 0x79, 0xae, 0x38, 0xfe, 0x04, 0x94, 0xb5, 0x36, 0xd1, 0x1f, 0x62, 0x7f, 0xfd, 0x2c, + 0x5d, 0xbf, 0xc4, 0x8c, 0xbc, 0x84, 0x13, 0x50, 0x36, 0x2c, 0xad, 0x83, 0x3b, 0xea, 0xa6, 0x61, + 0xb5, 0xef, 0xbb, 0xb5, 0x1c, 0x03, 0x31, 0x63, 0x8b, 0xda, 0xe4, 0x6f, 0x60, 0xda, 0xa3, 0x60, + 0xe5, 0x52, 0x9c, 0x84, 0x59, 0x98, 0xec, 0xbb, 0xd8, 0x51, 0xf5, 0x0e, 0x3f, 0x90, 0x39, 0xef, + 0x73, 0xa5, 0x83, 0x4e, 0x41, 0xa6, 0xa3, 0x11, 0x8d, 0x36, 0x5c, 0x5c, 0x3c, 0xea, 0x6f, 0xf5, + 0x1e, 0x1a, 0x15, 0x0a, 0x93, 0xaf, 0x00, 0xf2, 0x5c, 0x6e, 0x3c, 0xfb, 0x19, 0xc8, 0xba, 0x9e, + 0x81, 0xdf, 0x1f, 0x73, 0xd1, 0x2c, 0x89, 0x4a, 0x14, 0x86, 0x94, 0x9f, 0x0a, 0x20, 0xad, 0x62, + 0xe2, 0xe8, 0x6d, 0xf7, 0xb2, 0xe5, 0xc4, 0x95, 0xf5, 0x96, 0x75, 0x7f, 0x16, 0x4a, 0xbe, 0x74, + 0x55, 0x17, 0x93, 0xfd, 0x2f, 0xe8, 0xa2, 0x0f, 0x5d, 0xc7, 0x24, 0x3c, 0x31, 0x99, 0xe8, 0x7d, + 0x71, 0x1d, 0xea, 0x23, 0x3b, 0xe1, 0x04, 0x35, 0x20, 0x67, 0x52, 0x08, 0x67, 0xa8, 0x1a, 0x7d, + 0xfe, 0x3c, 0xbb, 0xc2, 0xfd, 0xf2, 0x6d, 0x38, 0x39, 0x22, 0x59, 0xe2, 0x84, 0x8c, 0x9f, 0xd2, + 0x86, 0x23, 0x3c, 0xe5, 0x2a, 0x26, 0x9a, 0xb7, 0x8d, 0x3e, 0xc3, 0x41, 0x3f, 0x42, 0xf4, 0x06, + 0x68, 0x40, 0x95, 0xfe, 0x50, 0x6d, 0xec, 0xa8, 0x7c, 0x0d, 0xce, 0x24, 0xb5, 0xdf, 0xc2, 0x0e, + 0xcb, 0x87, 0x8e, 0x04, 0x35, 0xa4, 0x99, 0xa8, 0xf8, 0x8a, 0x6b, 0x30, 0xbb, 0x67, 0x45, 0x5e, + 0xf6, 0xc7, 0x90, 0x37, 0xb9, 0x8d, 0x17, 0x5e, 0x4b, 0x16, 0x1e, 0xc4, 0x04, 0x48, 0xf9, 0x1f, + 0x01, 0x0e, 0x25, 0xde, 0x3a, 0xaf, 0xcc, 0x2d, 0xc7, 0x32, 0x55, 0x7f, 0x50, 0x0c, 0xb5, 0x5d, + 0xf1, 0xec, 0x2b, 0xdc, 0xbc, 0xd2, 0x89, 0x8a, 0x7f, 0x22, 0x26, 0xfe, 0x1e, 0xe4, 0xe8, 0x95, + 0xe2, 0x3f, 0xd2, 0xd3, 0x61, 0x29, 0x94, 0xfa, 0x5b, 0x9a, 0xee, 0xb4, 0x96, 0xbc, 0x77, 0xef, + 0xf9, 0x6e, 0xfd, 0xb5, 0x66, 0x4c, 0x16, 0xbf, 0xd4, 0xd1, 0x6c, 0x82, 0x1d, 0x85, 0xaf, 0x82, + 0x3e, 0x80, 0x1c, 0x7b, 0x9a, 0x6b, 0x19, 0xba, 0x5e, 0xd9, 0xd7, 0x5c, 0xf4, 0xf5, 0xe6, 0x10, + 0xf9, 0x47, 0x01, 0xb2, 0xac, 0xd3, 0xb7, 0x75, 0x10, 0x44, 0xc8, 0xe3, 0x5e, 0xdb, 0xea, 0xe8, + 0xbd, 0x2e, 0xdd, 0xc0, 0xac, 0x12, 0x7c, 0x23, 0xc4, 0xef, 0x05, 0x4f, 0xe9, 0x25, 0x7e, 0xf8, + 0x97, 0xa0, 0x1c, 0x53, 0x64, 0x6c, 0x0a, 0x14, 0xc6, 0x99, 0x02, 0x65, 0x15, 0x4a, 0x51, 0x0f, + 0x3a, 0x09, 0x19, 0xf2, 0xd8, 0x66, 0x57, 0x72, 0x65, 0x71, 0xca, 0x8f, 0xa6, 0xee, 0x8d, 0xc7, + 0x36, 0x56, 0xa8, 0xdb, 0xab, 0x86, 0x0e, 0x13, 0x6c, 0xfb, 0xe8, 0x6f, 0x4f, 0xbc, 0xf4, 0x25, + 0xe5, 0xda, 0x63, 0x1f, 0xf2, 0x0f, 0x02, 0x54, 0x42, 0xa5, 0x5c, 0xd6, 0x0d, 0xfc, 0x26, 0x84, + 0x22, 0x42, 0x7e, 0x4b, 0x37, 0x30, 0xad, 0x81, 0x2d, 0x17, 0x7c, 0x0f, 0x63, 0xea, 0xfd, 0x6b, + 0x50, 0x08, 0x5a, 0x40, 0x05, 0xc8, 0x2e, 0xdf, 0xbe, 0xb3, 0x74, 0xa3, 0x9a, 0x42, 0x65, 0x28, + 0xdc, 0x5c, 0xdb, 0x50, 0xd9, 0xa7, 0x80, 0x0e, 0x41, 0x51, 0x59, 0xbe, 0xb2, 0xfc, 0xa5, 0xba, + 0xba, 0xb4, 0x71, 0xf1, 0x6a, 0x75, 0x02, 0x21, 0xa8, 0x30, 0xc3, 0xcd, 0x35, 0x6e, 0x4b, 0x2f, + 0xfe, 0x96, 0x87, 0xbc, 0x5f, 0x23, 0x3a, 0x07, 0x99, 0x5b, 0x7d, 0x77, 0x1b, 0x1d, 0x09, 0x95, + 0x7a, 0xcf, 0xd1, 0x09, 0xe6, 0x27, 0x5a, 0x9c, 0xdd, 0x63, 0x67, 0xe7, 0x4e, 0x4e, 0xa1, 0x15, + 0x00, 0x2f, 0x94, 0x5d, 0x23, 0xe8, 0x9d, 0x10, 0xc8, 0x2c, 0x63, 0xa6, 0x69, 0x08, 0xa7, 0x05, + 0x74, 0x09, 0x8a, 0x91, 0x59, 0x15, 0x0d, 0xfd, 0x13, 0x49, 0x9c, 0x8b, 0x59, 0xe3, 0xb7, 0x97, + 0x9c, 0x3a, 0x2d, 0xa0, 0x35, 0xa8, 0x50, 0x97, 0x3f, 0x98, 0xba, 0x41, 0x51, 0xcd, 0x61, 0xc3, + 0xba, 0x78, 0x6c, 0x84, 0x37, 0xe8, 0xf0, 0x2a, 0x14, 0x23, 0xe3, 0x17, 0x12, 0x63, 0x5a, 0x8c, + 0xcd, 0xa8, 0xe2, 0xdc, 0x50, 0x5f, 0x90, 0xe9, 0x2e, 0x4c, 0x45, 0x1c, 0xbc, 0xcd, 0xfd, 0xf2, + 0x1d, 0x1f, 0xe2, 0x1b, 0xd2, 0xf2, 0x32, 0x40, 0x38, 0xf2, 0xa0, 0xa3, 0xb1, 0xa0, 0xe8, 0xcc, + 0x27, 0x8a, 0xc3, 0x5c, 0x41, 0x79, 0xeb, 0x50, 0x4d, 0x4e, 0x4e, 0xfb, 0x25, 0x9b, 0xdf, 0xeb, + 0x1a, 0x52, 0x5b, 0x0b, 0x0a, 0xc1, 0xab, 0x8f, 0x6a, 0x43, 0x06, 0x01, 0x96, 0x6c, 0xf4, 0x88, + 0x20, 0xa7, 0xd0, 0x65, 0x28, 0x2d, 0x19, 0xc6, 0x38, 0x69, 0xc4, 0xa8, 0xc7, 0x4d, 0xe6, 0x31, + 0x60, 0x76, 0xc4, 0x2b, 0x88, 0xde, 0x0d, 0xee, 0x88, 0x7d, 0xa7, 0x07, 0xf1, 0xbd, 0x03, 0x71, + 0xc1, 0x6a, 0x4f, 0xe0, 0xd8, 0xbe, 0x6f, 0xee, 0xd8, 0x6b, 0x9e, 0x3a, 0x00, 0x37, 0x84, 0xf5, + 0x0d, 0x38, 0x94, 0x78, 0x2a, 0x91, 0x94, 0xc8, 0x92, 0x78, 0xb5, 0xc5, 0xfa, 0x48, 0xbf, 0x9f, + 0xb7, 0xf5, 0xf9, 0xce, 0x0b, 0x29, 0xf5, 0xec, 0x85, 0x94, 0x7a, 0xf5, 0x42, 0x12, 0xbe, 0x1b, + 0x48, 0xc2, 0xaf, 0x03, 0x49, 0x78, 0x3a, 0x90, 0x84, 0x9d, 0x81, 0x24, 0xfc, 0x39, 0x90, 0x84, + 0xbf, 0x06, 0x52, 0xea, 0xd5, 0x40, 0x12, 0x7e, 0x7a, 0x29, 0xa5, 0x76, 0x5e, 0x4a, 0xa9, 0x67, + 0x2f, 0xa5, 0xd4, 0x57, 0xb9, 0xb6, 0xa1, 0xe3, 0x1e, 0xd9, 0xcc, 0xd1, 0xff, 0x8c, 0x7c, 0xf4, + 0xef, 0x00, 0x3c, 0x76, 0xeb, 0xb3, 0x84, 0x11, 0x00, 0x00, } func (x MatchType) String() string { diff --git a/pkg/ingester/http_admin_test.go b/pkg/ingester/http_admin_test.go index 6cc619871a0..ba6faa4a956 100644 --- a/pkg/ingester/http_admin_test.go +++ b/pkg/ingester/http_admin_test.go @@ -13,15 +13,13 @@ func TestUserStatsPageRendered(t *testing.T) { res := httptest.NewRecorder() userStats := []UserIDStats{ { - UserID: "123", - UserStats: UserStats{ - IngestionRate: 11.11, - NumSeries: 2222, - APIIngestionRate: 33.33, - RuleIngestionRate: 44.44, - ActiveSeries: 5555, - LoadedBlocks: 6666, - }, + UserID: "123", + IngestionRate: 11.11, + NumSeries: 2222, + APIIngestionRate: 33.33, + RuleIngestionRate: 44.44, + ActiveSeries: 5555, + LoadedBlocks: 6666, }, } AllUserStatsRender(res, req, userStats, 3, 3) diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go index c56e79d25b8..d91088e05b0 100644 --- a/pkg/ingester/ingester_test.go +++ b/pkg/ingester/ingester_test.go @@ -1144,9 +1144,8 @@ func TestIngester_Push(t *testing.T) { {MetricFamilyName: "metric_name_2", Help: "a help for metric_name_2", Unit: "", Type: cortexpb.GAUGE}, }, []cortexpb.WrappedHistogram{ - {Histogram: cortexpb.Histogram{ - TimestampMs: 10, - }}, + { + TimestampMs: 10}, }, cortexpb.API), }, @@ -4463,9 +4462,9 @@ func writeRequestSingleSeries(lbls labels.Labels, samples []cortexpb.Sample) *co Source: cortexpb.API, } - ts := cortexpb.TimeSeries{} - ts.Labels = cortexpb.FromLabelsToLabelAdapters(lbls) - ts.Samples = samples + ts := cortexpb.TimeSeries{ + Labels: cortexpb.FromLabelsToLabelAdapters(lbls), + Samples: samples} req.Timeseries = append(req.Timeseries, cortexpb.PreallocTimeseries{TimeSeries: &ts}) return req @@ -5920,26 +5919,22 @@ func Test_Ingester_AllUserStatsHandler(t *testing.T) { expect := UserStatsByTimeseries{ { - UserID: "user-1", - UserStats: UserStats{ - IngestionRate: 0.2, - NumSeries: 0, - APIIngestionRate: 0.2, - RuleIngestionRate: 0, - ActiveSeries: 3, - LoadedBlocks: 1, - }, + UserID: "user-1", + IngestionRate: 0.2, + NumSeries: 0, + APIIngestionRate: 0.2, + RuleIngestionRate: 0, + ActiveSeries: 3, + LoadedBlocks: 1, }, { - UserID: "user-2", - UserStats: UserStats{ - IngestionRate: 0.13333333333333333, - NumSeries: 0, - APIIngestionRate: 0.13333333333333333, - RuleIngestionRate: 0, - ActiveSeries: 2, - LoadedBlocks: 1, - }, + UserID: "user-2", + IngestionRate: 0.13333333333333333, + NumSeries: 0, + APIIngestionRate: 0.13333333333333333, + RuleIngestionRate: 0, + ActiveSeries: 2, + LoadedBlocks: 1, }, } assert.ElementsMatch(t, expect, resp) diff --git a/pkg/purger/tenant_deletion_api.go b/pkg/purger/tenant_deletion_api.go index bc82bef9fec..63000e18e1e 100644 --- a/pkg/purger/tenant_deletion_api.go +++ b/pkg/purger/tenant_deletion_api.go @@ -78,8 +78,8 @@ func (api *TenantDeletionAPI) DeleteTenantStatus(w http.ResponseWriter, r *http. return } - result := DeleteTenantStatusResponse{} - result.TenantID = userID + result := DeleteTenantStatusResponse{ + TenantID: userID} result.BlocksDeleted, err = api.isBlocksForUserDeleted(ctx, userID) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) diff --git a/pkg/querier/querier_test.go b/pkg/querier/querier_test.go index f062eeaac21..9c1e63a876d 100644 --- a/pkg/querier/querier_test.go +++ b/pkg/querier/querier_test.go @@ -665,9 +665,9 @@ func TestNoHistoricalQueryToIngester(t *testing.T) { MaxSamples: 1e6, Timeout: 1 * time.Minute, } - cfg := Config{} - // Disable active query tracker to avoid mmap error. - cfg.ActiveQueryTrackerDir = "" + cfg := Config{ + // Disable active query tracker to avoid mmap error. + ActiveQueryTrackerDir: ""} for _, thanosEngine := range []bool{true, false} { for _, encoding := range encodings { for _, c := range testCases { diff --git a/pkg/querier/stats/stats.pb.go b/pkg/querier/stats/stats.pb.go index 0eedf7ac11e..41d2e4f3bf7 100644 --- a/pkg/querier/stats/stats.pb.go +++ b/pkg/querier/stats/stats.pb.go @@ -239,7 +239,7 @@ func init() { func init() { proto.RegisterFile("stats.proto", fileDescriptor_b4756a0aec8b9d44) } var fileDescriptor_b4756a0aec8b9d44 = []byte{ - // 656 bytes of a gzipped FileDescriptorProto + // 653 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x4f, 0x13, 0x4f, 0x18, 0xdf, 0x01, 0xca, 0x9f, 0x9d, 0x2d, 0x50, 0x96, 0xfe, 0xe3, 0x42, 0xe2, 0x50, 0xc4, 0xc4, 0x1e, 0xcc, 0x62, 0xf0, 0x62, 0x34, 0x31, 0xa4, 0xbc, 0x69, 0x62, 0x8c, 0xb4, 0x24, 0x24, 0x5c, @@ -280,7 +280,7 @@ var fileDescriptor_b4756a0aec8b9d44 = []byte{ 0xf3, 0x2b, 0x62, 0x5d, 0x5c, 0x11, 0xeb, 0xe6, 0x8a, 0xa0, 0x8f, 0x39, 0x41, 0x5f, 0x73, 0x82, 0xce, 0x72, 0x82, 0xce, 0x73, 0x82, 0xbe, 0xe7, 0x04, 0xfd, 0xc8, 0x89, 0x75, 0x93, 0x13, 0xf4, 0xf9, 0x9a, 0x58, 0xe7, 0xd7, 0xc4, 0xba, 0xb8, 0x26, 0xd6, 0x9e, 0x7e, 0x12, 0xf7, 0xc7, 0xe1, - 0x9e, 0xcf, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x42, 0x1f, 0xae, 0x2f, 0x05, 0x00, 0x00, + 0x9e, 0xcf, 0x7f, 0x0e, 0x00, 0x5b, 0x42, 0x1f, 0xae, 0x2f, 0x05, 0x00, 0x00, } func (this *Stats) Equal(that interface{}) bool { diff --git a/pkg/querier/store_gateway_client.go b/pkg/querier/store_gateway_client.go index 80a869f8f48..02051e12299 100644 --- a/pkg/querier/store_gateway_client.go +++ b/pkg/querier/store_gateway_client.go @@ -73,18 +73,16 @@ func (c *storeGatewayClient) RemoteAddress() string { func newStoreGatewayClientPool(discovery client.PoolServiceDiscovery, clientConfig ClientConfig, logger log.Logger, reg prometheus.Registerer) *client.Pool { // We prefer sane defaults instead of exposing further config options. clientCfg := grpcclient.ConfigWithHealthCheck{ - Config: grpcclient.Config{ - MaxRecvMsgSize: 100 << 20, - MaxSendMsgSize: 16 << 20, - GRPCCompression: clientConfig.GRPCCompression, - RateLimit: 0, - RateLimitBurst: 0, - BackoffOnRatelimits: false, - TLSEnabled: clientConfig.TLSEnabled, - TLS: clientConfig.TLS, - ConnectTimeout: clientConfig.ConnectTimeout, - }, - HealthCheckConfig: clientConfig.HealthCheckConfig, + MaxRecvMsgSize: 100 << 20, + MaxSendMsgSize: 16 << 20, + GRPCCompression: clientConfig.GRPCCompression, + RateLimit: 0, + RateLimitBurst: 0, + BackoffOnRatelimits: false, + TLSEnabled: clientConfig.TLSEnabled, + TLS: clientConfig.TLS, + ConnectTimeout: clientConfig.ConnectTimeout, + HealthCheckConfig: clientConfig.HealthCheckConfig, } poolCfg := client.PoolConfig{ CheckInterval: time.Minute, diff --git a/pkg/querier/tripperware/query.pb.go b/pkg/querier/tripperware/query.pb.go index a428eaf1bd2..e0cf8963ab5 100644 --- a/pkg/querier/tripperware/query.pb.go +++ b/pkg/querier/tripperware/query.pb.go @@ -1003,85 +1003,84 @@ func init() { func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } var fileDescriptor_5c6ac9b241082464 = []byte{ - // 1233 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xc6, 0xf6, 0x26, 0x7e, 0x4e, 0x93, 0x32, 0xe9, 0x87, 0x53, 0xca, 0xae, 0x59, 0x81, - 0x14, 0x04, 0x75, 0x44, 0x2a, 0x40, 0x80, 0xa8, 0xe8, 0x42, 0x21, 0x2d, 0x94, 0xb6, 0x93, 0xaa, - 0x48, 0x5c, 0xaa, 0xb1, 0x3d, 0x75, 0x96, 0x78, 0x3f, 0x3a, 0x3b, 0xdb, 0xc4, 0x9c, 0x38, 0x73, - 0xe2, 0x8c, 0xc4, 0x81, 0x1b, 0x07, 0xfe, 0x90, 0x1c, 0x2b, 0x4e, 0x15, 0x12, 0x2b, 0xea, 0x5c, - 0xd0, 0x9e, 0xfa, 0x27, 0xa0, 0xf9, 0xd8, 0xf5, 0x3a, 0x71, 0x12, 0xf5, 0xc4, 0xc5, 0xd9, 0x79, - 0xef, 0xf7, 0x7b, 0x5f, 0xf3, 0xde, 0x9b, 0x40, 0xf3, 0x71, 0x42, 0xd9, 0xa8, 0x13, 0xb1, 0x90, - 0x87, 0xa8, 0xc9, 0x99, 0x17, 0x45, 0x94, 0xed, 0x12, 0x46, 0x2f, 0x9d, 0x1b, 0x84, 0x83, 0x50, - 0xca, 0xd7, 0xc5, 0x97, 0x82, 0x5c, 0xb2, 0x06, 0x61, 0x38, 0x18, 0xd2, 0x75, 0x79, 0xea, 0x26, - 0x8f, 0xd6, 0xfb, 0x09, 0x23, 0xdc, 0x0b, 0x03, 0xad, 0x5f, 0x3d, 0xac, 0x27, 0x81, 0xb6, 0x7e, - 0xe9, 0xc3, 0x81, 0xc7, 0xb7, 0x93, 0x6e, 0xa7, 0x17, 0xfa, 0xeb, 0xbd, 0x90, 0x71, 0xba, 0x17, - 0xb1, 0xf0, 0x7b, 0xda, 0xe3, 0xfa, 0xb4, 0x1e, 0xed, 0x0c, 0x72, 0x45, 0x57, 0x7f, 0x28, 0xaa, - 0xf3, 0x53, 0x15, 0xd0, 0x5d, 0x16, 0xfa, 0x94, 0x6f, 0xd3, 0x24, 0xc6, 0x34, 0x8e, 0xc2, 0x20, - 0xa6, 0xc8, 0x01, 0x73, 0x8b, 0x13, 0x9e, 0xc4, 0x2d, 0xa3, 0x6d, 0xac, 0x35, 0x5c, 0xc8, 0x52, - 0xdb, 0x8c, 0xa5, 0x04, 0x6b, 0x0d, 0xfa, 0x12, 0x6a, 0x9f, 0x13, 0x4e, 0x5a, 0x73, 0x6d, 0x63, - 0xad, 0xb9, 0xf1, 0x6a, 0xa7, 0x94, 0x62, 0x67, 0x62, 0x52, 0x40, 0xdc, 0x0b, 0xfb, 0xa9, 0x5d, - 0xc9, 0x52, 0x7b, 0xa9, 0x4f, 0x38, 0x79, 0x27, 0xf4, 0x3d, 0x4e, 0xfd, 0x88, 0x8f, 0xb0, 0x34, - 0x80, 0xde, 0x83, 0xc6, 0x0d, 0xc6, 0x42, 0x76, 0x7f, 0x14, 0xd1, 0x56, 0x55, 0xfa, 0xbb, 0x98, - 0xa5, 0xf6, 0x0a, 0xcd, 0x85, 0x25, 0xc6, 0x04, 0x89, 0xde, 0x82, 0xba, 0x3c, 0xb4, 0x6a, 0x92, - 0xb2, 0x92, 0xa5, 0xf6, 0xb2, 0xa4, 0x94, 0xe0, 0x0a, 0x81, 0xbe, 0x80, 0xf9, 0x4d, 0x4a, 0xfa, - 0x94, 0xc5, 0xad, 0x7a, 0xbb, 0xba, 0xd6, 0xdc, 0x78, 0xf3, 0x98, 0x68, 0xf3, 0x02, 0x28, 0xb4, - 0x5b, 0xcf, 0x52, 0xdb, 0xb8, 0x82, 0x73, 0x32, 0xda, 0x80, 0x85, 0x6f, 0x09, 0x0b, 0xbc, 0x60, - 0x10, 0xb7, 0xcc, 0x76, 0x75, 0xad, 0xe1, 0x5e, 0xc8, 0x52, 0x1b, 0xed, 0x6a, 0x59, 0xc9, 0x71, - 0x81, 0x13, 0x61, 0xde, 0x0c, 0x1e, 0x85, 0x71, 0x6b, 0x5e, 0x12, 0x64, 0x98, 0x9e, 0x10, 0x94, - 0xc3, 0x94, 0x08, 0xe7, 0x6f, 0x03, 0x96, 0xa6, 0x2b, 0x87, 0x3a, 0x00, 0x98, 0xc6, 0xc9, 0x90, - 0xcb, 0xe2, 0xa8, 0xcb, 0x58, 0xca, 0x52, 0x1b, 0x58, 0x21, 0xc5, 0x25, 0x04, 0xba, 0x05, 0xa6, - 0x3a, 0xe9, 0x6b, 0x71, 0x8e, 0x49, 0xf4, 0x9e, 0x68, 0x4e, 0x85, 0x74, 0x97, 0xf4, 0xed, 0x98, - 0xca, 0x26, 0xd6, 0x16, 0xd0, 0x1d, 0xa8, 0x8b, 0x2b, 0x8f, 0xe5, 0x9d, 0x34, 0x37, 0xde, 0x38, - 0xa5, 0x66, 0xa2, 0x2d, 0x62, 0x95, 0x9f, 0xa4, 0x95, 0xf3, 0x93, 0x02, 0x67, 0x07, 0x96, 0x3e, - 0x23, 0xbd, 0x6d, 0xda, 0x2f, 0xfa, 0x6c, 0x15, 0xaa, 0x3b, 0x74, 0xa4, 0xf3, 0x9a, 0xcf, 0x52, - 0x5b, 0x1c, 0xb1, 0xf8, 0x41, 0xd7, 0x60, 0x9e, 0xee, 0x71, 0x1a, 0xf0, 0xb8, 0x35, 0x27, 0xef, - 0x6c, 0x65, 0xca, 0xff, 0x0d, 0xa9, 0x73, 0x97, 0x75, 0xec, 0x39, 0x16, 0xe7, 0x1f, 0xce, 0x1f, - 0x06, 0x98, 0x0a, 0x84, 0x6c, 0x99, 0x08, 0xe3, 0xd2, 0x4f, 0xd5, 0x6d, 0x64, 0xa9, 0xad, 0x04, - 0x58, 0xfd, 0x11, 0x61, 0xd0, 0xa0, 0x2f, 0x4b, 0x56, 0x55, 0x61, 0xd0, 0xa0, 0x8f, 0xc5, 0x0f, - 0x6a, 0xc3, 0x02, 0x67, 0xa4, 0x47, 0x1f, 0x7a, 0x7d, 0xdd, 0x68, 0x79, 0x53, 0x48, 0xf1, 0xcd, - 0x3e, 0xba, 0x06, 0x0b, 0x4c, 0xe7, 0xd3, 0xaa, 0xcb, 0x4a, 0x9d, 0xeb, 0xa8, 0x59, 0xed, 0xe4, - 0xb3, 0xda, 0xb9, 0x1e, 0x8c, 0xdc, 0xc5, 0x2c, 0xb5, 0x0b, 0x24, 0x2e, 0xbe, 0x6e, 0xd5, 0x16, - 0xaa, 0x67, 0x6b, 0xce, 0x2f, 0x73, 0xb0, 0xb8, 0x45, 0xfc, 0x68, 0x48, 0xb7, 0x38, 0xa3, 0xc4, - 0x47, 0x7b, 0x60, 0x0e, 0x49, 0x97, 0x0e, 0xc5, 0x08, 0xaa, 0xf4, 0xf3, 0x09, 0xee, 0x7c, 0x2d, - 0xe4, 0x77, 0x89, 0xc7, 0xdc, 0xaf, 0x44, 0xfa, 0x7f, 0xa5, 0xf6, 0x4b, 0x6d, 0x00, 0xc5, 0xbf, - 0xde, 0x27, 0x11, 0xa7, 0x4c, 0xdc, 0xbb, 0x4f, 0x39, 0xf3, 0x7a, 0x58, 0xfb, 0x43, 0x1f, 0xc1, - 0x7c, 0x2c, 0x23, 0xc9, 0x2b, 0x7f, 0x76, 0xe2, 0x5a, 0x85, 0x38, 0x69, 0x99, 0x27, 0x64, 0x98, - 0xd0, 0x18, 0xe7, 0x04, 0x74, 0x1f, 0x60, 0xdb, 0x8b, 0x79, 0x38, 0x60, 0xc4, 0x17, 0x8d, 0x23, - 0xe8, 0xed, 0xa9, 0x8b, 0x53, 0x16, 0x36, 0x73, 0x90, 0x4c, 0x03, 0x69, 0x73, 0x25, 0x2e, 0x2e, - 0x7d, 0x3b, 0x3f, 0xc0, 0xca, 0x0c, 0x1a, 0x7a, 0x1d, 0x16, 0xb9, 0xe7, 0xd3, 0x98, 0x13, 0x3f, - 0x7a, 0xe8, 0xab, 0x5d, 0x55, 0xc5, 0xcd, 0x42, 0x76, 0x3b, 0x46, 0x9f, 0x42, 0xa3, 0xb0, 0xa3, - 0x47, 0xe2, 0xf2, 0x49, 0xe1, 0xb8, 0x35, 0x11, 0x0a, 0x9e, 0x90, 0x9c, 0xc7, 0xb0, 0x7c, 0x08, - 0x83, 0xce, 0x41, 0xbd, 0x17, 0x26, 0x81, 0xea, 0x27, 0x03, 0xab, 0x03, 0x3a, 0x0b, 0xd5, 0x38, - 0x51, 0x4e, 0x0c, 0x2c, 0x3e, 0xd1, 0xfb, 0x30, 0xdf, 0x4d, 0x7a, 0x3b, 0x94, 0xe7, 0x95, 0x98, - 0x76, 0x3d, 0x71, 0x2a, 0x41, 0x38, 0x07, 0x3b, 0x31, 0x2c, 0x1f, 0xd2, 0x21, 0x0b, 0xa0, 0x1b, - 0x26, 0x41, 0x9f, 0x30, 0x8f, 0xaa, 0x44, 0xeb, 0xb8, 0x24, 0x11, 0x21, 0x0d, 0xc3, 0x5d, 0xca, - 0xb4, 0x7b, 0x75, 0x10, 0xd2, 0x44, 0xb8, 0x93, 0x13, 0x6c, 0x60, 0x75, 0x98, 0x84, 0x5f, 0x2b, - 0x85, 0xef, 0xf8, 0x70, 0xf1, 0x98, 0x99, 0x46, 0x78, 0xd2, 0x10, 0x86, 0x2c, 0xe1, 0xdb, 0xa7, - 0xad, 0x02, 0x85, 0x56, 0x1b, 0xa1, 0x29, 0xc6, 0x53, 0xf3, 0x8b, 0x46, 0x71, 0xf6, 0xe7, 0xc0, - 0x3a, 0x99, 0x88, 0xee, 0xc0, 0x79, 0x1e, 0x72, 0x32, 0x94, 0xbb, 0x8a, 0x74, 0x87, 0xb9, 0x56, - 0x8f, 0xf1, 0x6a, 0x96, 0xda, 0xb3, 0x01, 0x78, 0xb6, 0x18, 0xfd, 0x66, 0xc0, 0xe5, 0x99, 0x9a, - 0xbb, 0x94, 0x6d, 0x71, 0x1a, 0xe9, 0x76, 0xff, 0xf8, 0x94, 0xec, 0x0e, 0xb3, 0x65, 0xb4, 0xda, - 0x84, 0xdb, 0xce, 0x52, 0xfb, 0x44, 0x27, 0xf8, 0x44, 0x2d, 0x7a, 0x17, 0x9a, 0x11, 0x25, 0x3b, - 0x79, 0xaa, 0x55, 0x99, 0xea, 0x72, 0x96, 0xda, 0x65, 0x31, 0x2e, 0x1f, 0x1c, 0x0f, 0x5e, 0x32, - 0x48, 0xd1, 0x01, 0x72, 0x70, 0xf5, 0xc4, 0xa8, 0xc3, 0x91, 0x71, 0x9a, 0x3b, 0x32, 0x4e, 0xce, - 0x7d, 0x68, 0x1d, 0xf7, 0x58, 0xa2, 0x55, 0xa8, 0x7d, 0x43, 0xfc, 0xfc, 0x91, 0xd2, 0x5b, 0x52, - 0x8a, 0xd0, 0x6b, 0x60, 0x3e, 0x90, 0x8b, 0x42, 0x56, 0xb8, 0x50, 0x6a, 0xa1, 0xf3, 0xab, 0x01, - 0xe7, 0x67, 0x3e, 0x4d, 0xe8, 0x0a, 0x98, 0x4f, 0x68, 0x8f, 0x87, 0x4c, 0x37, 0xde, 0xf4, 0x1b, - 0xf0, 0x40, 0xaa, 0x36, 0x2b, 0x58, 0x83, 0xd0, 0x65, 0x58, 0x60, 0x64, 0xd7, 0x1d, 0x71, 0xaa, - 0xa2, 0x5f, 0xdc, 0xac, 0xe0, 0x42, 0x22, 0x8c, 0xf9, 0x84, 0x33, 0x6f, 0x4f, 0x3f, 0x68, 0xd3, - 0xc6, 0x6e, 0x4b, 0x95, 0x30, 0xa6, 0x40, 0xee, 0x02, 0xe8, 0x07, 0xd1, 0xf9, 0x04, 0x4c, 0xe5, - 0x0a, 0x5d, 0x2d, 0x4f, 0xc2, 0xd1, 0x47, 0x49, 0x6f, 0x47, 0xb5, 0x43, 0x8a, 0x56, 0xff, 0x73, - 0x0e, 0x4c, 0xa5, 0xf9, 0x1f, 0x97, 0xfa, 0x07, 0x60, 0xaa, 0x78, 0xf4, 0x16, 0x3c, 0xba, 0xd3, - 0xcf, 0xec, 0xa7, 0xb6, 0x21, 0x9e, 0x46, 0xd9, 0x0d, 0x58, 0xc3, 0xd1, 0xbd, 0xf2, 0x06, 0x55, - 0x85, 0x3b, 0x7d, 0xa1, 0xbf, 0xa2, 0x6d, 0x4d, 0xa8, 0xa5, 0x95, 0x8a, 0x5c, 0x58, 0x64, 0x64, - 0xb7, 0x60, 0xc8, 0x3d, 0x34, 0x55, 0x8b, 0xc9, 0xf6, 0x6b, 0x68, 0x43, 0xc6, 0x15, 0x3c, 0xc5, - 0x71, 0xee, 0x80, 0xa9, 0x6e, 0x0c, 0xdd, 0x80, 0x33, 0x71, 0xe9, 0xe1, 0xcc, 0x4b, 0xbb, 0x3a, - 0x23, 0x48, 0x85, 0xd0, 0xf7, 0x33, 0xcd, 0x72, 0xaf, 0x3f, 0x7d, 0x6e, 0x55, 0x9e, 0x3d, 0xb7, - 0x2a, 0x2f, 0x9e, 0x5b, 0xc6, 0x8f, 0x63, 0xcb, 0xf8, 0x7d, 0x6c, 0x19, 0xfb, 0x63, 0xcb, 0x78, - 0x3a, 0xb6, 0x8c, 0x7f, 0xc6, 0x96, 0xf1, 0xef, 0xd8, 0xaa, 0xbc, 0x18, 0x5b, 0xc6, 0xcf, 0x07, - 0x56, 0xe5, 0xe9, 0x81, 0x55, 0x79, 0x76, 0x60, 0x55, 0xbe, 0x2b, 0xff, 0x63, 0xdf, 0x35, 0xe5, - 0x7b, 0x7f, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0xa5, 0x92, 0x82, 0xfb, 0x0b, 0x00, - 0x00, + // 1232 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6f, 0x1b, 0x55, + 0x10, 0xf7, 0x66, 0xed, 0x4d, 0x32, 0x4e, 0x93, 0xf2, 0xd2, 0x0f, 0xa7, 0x94, 0x5d, 0xb3, 0x02, + 0x29, 0x08, 0xea, 0x88, 0x54, 0x80, 0x00, 0x51, 0xd1, 0x85, 0x42, 0x5a, 0x28, 0x6d, 0x5f, 0xaa, + 0x22, 0x71, 0xa9, 0x9e, 0xed, 0x57, 0x67, 0x89, 0xf7, 0xa3, 0x6f, 0xdf, 0x36, 0x09, 0x27, 0xce, + 0x9c, 0x38, 0x23, 0x71, 0xe0, 0xc6, 0x81, 0x3f, 0x24, 0xc7, 0x8a, 0x53, 0x85, 0xc4, 0x8a, 0x3a, + 0x17, 0xb4, 0xa7, 0xfe, 0x09, 0xe8, 0x7d, 0xec, 0x7a, 0x9d, 0x38, 0x89, 0x7a, 0xe2, 0xe2, 0xec, + 0x9b, 0xf9, 0xcd, 0xcc, 0x6f, 0xe6, 0xcd, 0xcc, 0x0b, 0x34, 0x1f, 0xa7, 0x94, 0xed, 0x75, 0x62, + 0x16, 0xf1, 0x08, 0x35, 0x39, 0xf3, 0xe3, 0x98, 0xb2, 0x1d, 0xc2, 0xe8, 0xa5, 0x73, 0x83, 0x68, + 0x10, 0x49, 0xf9, 0x9a, 0xf8, 0x52, 0x90, 0x4b, 0xf6, 0x20, 0x8a, 0x06, 0x43, 0xba, 0x26, 0x4f, + 0xdd, 0xf4, 0xd1, 0x5a, 0x3f, 0x65, 0x84, 0xfb, 0x51, 0xa8, 0xf5, 0x2b, 0x87, 0xf5, 0x24, 0xd4, + 0xde, 0x2f, 0x7d, 0x38, 0xf0, 0xf9, 0x56, 0xda, 0xed, 0xf4, 0xa2, 0x60, 0xad, 0x17, 0x31, 0x4e, + 0x77, 0x63, 0x16, 0x7d, 0x4f, 0x7b, 0x5c, 0x9f, 0xd6, 0xe2, 0xed, 0x41, 0xa1, 0xe8, 0xea, 0x0f, + 0x65, 0xea, 0xfe, 0x64, 0x02, 0xba, 0xcb, 0xa2, 0x80, 0xf2, 0x2d, 0x9a, 0x26, 0x98, 0x26, 0x71, + 0x14, 0x26, 0x14, 0xb9, 0x60, 0x6d, 0x72, 0xc2, 0xd3, 0xa4, 0x65, 0xb4, 0x8d, 0xd5, 0x79, 0x0f, + 0xf2, 0xcc, 0xb1, 0x12, 0x29, 0xc1, 0x5a, 0x83, 0xbe, 0x84, 0xfa, 0xe7, 0x84, 0x93, 0xd6, 0x4c, + 0xdb, 0x58, 0x6d, 0xae, 0xbf, 0xda, 0xa9, 0xa4, 0xd8, 0x19, 0xbb, 0x14, 0x10, 0xef, 0xc2, 0x7e, + 0xe6, 0xd4, 0xf2, 0xcc, 0x59, 0xec, 0x13, 0x4e, 0xde, 0x89, 0x02, 0x9f, 0xd3, 0x20, 0xe6, 0x7b, + 0x58, 0x3a, 0x40, 0xef, 0xc1, 0xfc, 0x0d, 0xc6, 0x22, 0x76, 0x7f, 0x2f, 0xa6, 0x2d, 0x53, 0xc6, + 0xbb, 0x98, 0x67, 0xce, 0x32, 0x2d, 0x84, 0x15, 0x8b, 0x31, 0x12, 0xbd, 0x05, 0x0d, 0x79, 0x68, + 0xd5, 0xa5, 0xc9, 0x72, 0x9e, 0x39, 0x4b, 0xd2, 0xa4, 0x02, 0x57, 0x08, 0xf4, 0x05, 0xcc, 0x6e, + 0x50, 0xd2, 0xa7, 0x2c, 0x69, 0x35, 0xda, 0xe6, 0x6a, 0x73, 0xfd, 0xcd, 0x63, 0xd8, 0x16, 0x05, + 0x50, 0x68, 0xaf, 0x91, 0x67, 0x8e, 0x71, 0x05, 0x17, 0xc6, 0x68, 0x1d, 0xe6, 0xbe, 0x25, 0x2c, + 0xf4, 0xc3, 0x41, 0xd2, 0xb2, 0xda, 0xe6, 0xea, 0xbc, 0x77, 0x21, 0xcf, 0x1c, 0xb4, 0xa3, 0x65, + 0x95, 0xc0, 0x25, 0x4e, 0xd0, 0xbc, 0x19, 0x3e, 0x8a, 0x92, 0xd6, 0x6c, 0xdb, 0x2c, 0x68, 0xfa, + 0x42, 0x50, 0xa5, 0x29, 0x11, 0xee, 0xdf, 0x06, 0x2c, 0x4e, 0x56, 0x0e, 0x75, 0x00, 0x30, 0x4d, + 0xd2, 0x21, 0x97, 0xc5, 0x51, 0x97, 0xb1, 0x98, 0x67, 0x0e, 0xb0, 0x52, 0x8a, 0x2b, 0x08, 0x74, + 0x0b, 0x2c, 0x75, 0xd2, 0xd7, 0xe2, 0x1e, 0x93, 0xe8, 0x3d, 0xd1, 0x9c, 0x0a, 0xe9, 0x2d, 0xea, + 0xdb, 0xb1, 0x94, 0x4f, 0xac, 0x3d, 0xa0, 0x3b, 0xd0, 0x10, 0x57, 0x9e, 0xc8, 0x3b, 0x69, 0xae, + 0xbf, 0x71, 0x4a, 0xcd, 0x44, 0x5b, 0x24, 0x2a, 0x3f, 0x69, 0x56, 0xcd, 0x4f, 0x0a, 0xdc, 0x6d, + 0x58, 0xfc, 0x8c, 0xf4, 0xb6, 0x68, 0xbf, 0xec, 0xb3, 0x15, 0x30, 0xb7, 0xe9, 0x9e, 0xce, 0x6b, + 0x36, 0xcf, 0x1c, 0x71, 0xc4, 0xe2, 0x07, 0x5d, 0x83, 0x59, 0xba, 0xcb, 0x69, 0xc8, 0x93, 0xd6, + 0x8c, 0xbc, 0xb3, 0xe5, 0x89, 0xf8, 0x37, 0xa4, 0xce, 0x5b, 0xd2, 0xdc, 0x0b, 0x2c, 0x2e, 0x3e, + 0xdc, 0x3f, 0x0c, 0xb0, 0x14, 0x08, 0x39, 0x32, 0x11, 0xc6, 0x65, 0x1c, 0xd3, 0x9b, 0xcf, 0x33, + 0x47, 0x09, 0xb0, 0xfa, 0x23, 0x68, 0xd0, 0xb0, 0x2f, 0x4b, 0x66, 0x2a, 0x1a, 0x34, 0xec, 0x63, + 0xf1, 0x83, 0xda, 0x30, 0xc7, 0x19, 0xe9, 0xd1, 0x87, 0x7e, 0x5f, 0x37, 0x5a, 0xd1, 0x14, 0x52, + 0x7c, 0xb3, 0x8f, 0xae, 0xc1, 0x1c, 0xd3, 0xf9, 0xb4, 0x1a, 0xb2, 0x52, 0xe7, 0x3a, 0x6a, 0x56, + 0x3b, 0xc5, 0xac, 0x76, 0xae, 0x87, 0x7b, 0xde, 0x42, 0x9e, 0x39, 0x25, 0x12, 0x97, 0x5f, 0xb7, + 0xea, 0x73, 0xe6, 0xd9, 0xba, 0xfb, 0xcb, 0x0c, 0x2c, 0x6c, 0x92, 0x20, 0x1e, 0xd2, 0x4d, 0xce, + 0x28, 0x09, 0xd0, 0x2e, 0x58, 0x43, 0xd2, 0xa5, 0x43, 0x31, 0x82, 0x2a, 0xfd, 0x62, 0x82, 0x3b, + 0x5f, 0x0b, 0xf9, 0x5d, 0xe2, 0x33, 0xef, 0x2b, 0x91, 0xfe, 0x5f, 0x99, 0xf3, 0x52, 0x1b, 0x40, + 0xd9, 0x5f, 0xef, 0x93, 0x98, 0x53, 0x26, 0xee, 0x3d, 0xa0, 0x9c, 0xf9, 0x3d, 0xac, 0xe3, 0xa1, + 0x8f, 0x60, 0x36, 0x91, 0x4c, 0x8a, 0xca, 0x9f, 0x1d, 0x87, 0x56, 0x14, 0xc7, 0x2d, 0xf3, 0x84, + 0x0c, 0x53, 0x9a, 0xe0, 0xc2, 0x00, 0xdd, 0x07, 0xd8, 0xf2, 0x13, 0x1e, 0x0d, 0x18, 0x09, 0x44, + 0xe3, 0x08, 0xf3, 0xf6, 0xc4, 0xc5, 0x29, 0x0f, 0x1b, 0x05, 0x48, 0xa6, 0x81, 0xb4, 0xbb, 0x8a, + 0x2d, 0xae, 0x7c, 0xbb, 0x3f, 0xc0, 0xf2, 0x14, 0x33, 0xf4, 0x3a, 0x2c, 0x70, 0x3f, 0xa0, 0x09, + 0x27, 0x41, 0xfc, 0x30, 0x50, 0xbb, 0xca, 0xc4, 0xcd, 0x52, 0x76, 0x3b, 0x41, 0x9f, 0xc2, 0x7c, + 0xe9, 0x47, 0x8f, 0xc4, 0xe5, 0x93, 0xe8, 0x78, 0x75, 0x41, 0x05, 0x8f, 0x8d, 0xdc, 0xc7, 0xb0, + 0x74, 0x08, 0x83, 0xce, 0x41, 0xa3, 0x17, 0xa5, 0xa1, 0xea, 0x27, 0x03, 0xab, 0x03, 0x3a, 0x0b, + 0x66, 0x92, 0xaa, 0x20, 0x06, 0x16, 0x9f, 0xe8, 0x7d, 0x98, 0xed, 0xa6, 0xbd, 0x6d, 0xca, 0x8b, + 0x4a, 0x4c, 0x86, 0x1e, 0x07, 0x95, 0x20, 0x5c, 0x80, 0xdd, 0x04, 0x96, 0x0e, 0xe9, 0x90, 0x0d, + 0xd0, 0x8d, 0xd2, 0xb0, 0x4f, 0x98, 0x4f, 0x55, 0xa2, 0x0d, 0x5c, 0x91, 0x08, 0x4a, 0xc3, 0x68, + 0x87, 0x32, 0x1d, 0x5e, 0x1d, 0x84, 0x34, 0x15, 0xe1, 0xe4, 0x04, 0x1b, 0x58, 0x1d, 0xc6, 0xf4, + 0xeb, 0x15, 0xfa, 0x6e, 0x00, 0x17, 0x8f, 0x99, 0x69, 0x84, 0xc7, 0x0d, 0x61, 0xc8, 0x12, 0xbe, + 0x7d, 0xda, 0x2a, 0x50, 0x68, 0xb5, 0x11, 0x9a, 0x62, 0x3c, 0xb5, 0x7d, 0xd9, 0x28, 0xee, 0xfe, + 0x0c, 0xd8, 0x27, 0x1b, 0xa2, 0x3b, 0x70, 0x9e, 0x47, 0x9c, 0x0c, 0xe5, 0xae, 0x22, 0xdd, 0x21, + 0xdd, 0xac, 0x90, 0x30, 0xbd, 0x95, 0x3c, 0x73, 0xa6, 0x03, 0xf0, 0x74, 0x31, 0xfa, 0xcd, 0x80, + 0xcb, 0x53, 0x35, 0x77, 0x29, 0xdb, 0xe4, 0x34, 0xd6, 0xed, 0xfe, 0xf1, 0x29, 0xd9, 0x1d, 0xb6, + 0x96, 0x6c, 0xb5, 0x0b, 0xaf, 0x9d, 0x67, 0xce, 0x89, 0x41, 0xf0, 0x89, 0x5a, 0xf4, 0x2e, 0x34, + 0x63, 0x4a, 0xb6, 0x8b, 0x54, 0x4d, 0x99, 0xea, 0x52, 0x9e, 0x39, 0x55, 0x31, 0xae, 0x1e, 0x5c, + 0x1f, 0x5e, 0x92, 0xa4, 0xe8, 0x00, 0x39, 0xb8, 0x7a, 0x62, 0xd4, 0xe1, 0xc8, 0x38, 0xcd, 0x1c, + 0x19, 0x27, 0xf7, 0x3e, 0xb4, 0x8e, 0x7b, 0x2c, 0xd1, 0x0a, 0xd4, 0xbf, 0x21, 0x41, 0xf1, 0x48, + 0xe9, 0x2d, 0x29, 0x45, 0xe8, 0x35, 0xb0, 0x1e, 0x88, 0x10, 0x6a, 0xa1, 0x94, 0x4a, 0x2d, 0x74, + 0x7f, 0x35, 0xe0, 0xfc, 0xd4, 0xa7, 0x09, 0x5d, 0x01, 0xeb, 0x09, 0xed, 0xf1, 0x88, 0xe9, 0xc6, + 0x9b, 0x7c, 0x03, 0x1e, 0x48, 0xd5, 0x46, 0x0d, 0x6b, 0x10, 0xba, 0x0c, 0x73, 0x8c, 0xec, 0x78, + 0x7b, 0x9c, 0x2a, 0xf6, 0x0b, 0x1b, 0x35, 0x5c, 0x4a, 0x84, 0xb3, 0x80, 0x70, 0xe6, 0xef, 0xb6, + 0xcc, 0x29, 0xce, 0x6e, 0x4b, 0x95, 0x70, 0xa6, 0x40, 0xde, 0x1c, 0xe8, 0x07, 0xd1, 0xfd, 0x04, + 0x2c, 0x15, 0x0a, 0x5d, 0xad, 0x4e, 0xc2, 0xd1, 0x47, 0x49, 0x6f, 0x47, 0xb5, 0x43, 0xca, 0x56, + 0xff, 0x73, 0x06, 0x2c, 0xa5, 0xf9, 0x1f, 0x97, 0xfa, 0x07, 0x60, 0x29, 0x3e, 0x7a, 0x0b, 0x1e, + 0xdd, 0xe9, 0x67, 0xf6, 0x33, 0xc7, 0x10, 0x4f, 0xa3, 0xec, 0x06, 0xac, 0xe1, 0xe8, 0x5e, 0x75, + 0x83, 0xaa, 0xc2, 0x9d, 0xbe, 0xd0, 0x5f, 0xd1, 0xbe, 0xc6, 0xa6, 0x95, 0x95, 0x8a, 0x3c, 0x58, + 0x60, 0x64, 0xa7, 0xb4, 0x90, 0x7b, 0x68, 0xa2, 0x16, 0xa5, 0xca, 0x9b, 0xd7, 0x8e, 0x8c, 0x2b, + 0x78, 0xc2, 0xc6, 0xbd, 0x03, 0x96, 0xba, 0x31, 0x74, 0x03, 0xce, 0x24, 0x95, 0x87, 0xb3, 0x28, + 0xed, 0xca, 0x14, 0x92, 0x0a, 0xa1, 0xef, 0x67, 0xd2, 0xca, 0xbb, 0xfe, 0xf4, 0xb9, 0x5d, 0x7b, + 0xf6, 0xdc, 0xae, 0xbd, 0x78, 0x6e, 0x1b, 0x3f, 0x8e, 0x6c, 0xe3, 0xf7, 0x91, 0x6d, 0xec, 0x8f, + 0x6c, 0xe3, 0xe9, 0xc8, 0x36, 0xfe, 0x19, 0xd9, 0xc6, 0xbf, 0x23, 0xbb, 0xf6, 0x62, 0x64, 0x1b, + 0x3f, 0x1f, 0xd8, 0xb5, 0xa7, 0x07, 0x76, 0xed, 0xd9, 0x81, 0x5d, 0xfb, 0xae, 0xfa, 0x8f, 0x7d, + 0xd7, 0x92, 0xef, 0xfd, 0xd5, 0xff, 0x06, 0x00, 0x32, 0xa5, 0x92, 0x82, 0xfb, 0x0b, 0x00, 0x00, } func (this *PrometheusResponse) Equal(that interface{}) bool { diff --git a/pkg/querier/tripperware/queryrange/queryrange.pb.go b/pkg/querier/tripperware/queryrange/queryrange.pb.go index 1edbd8df039..dcc42aea9d8 100644 --- a/pkg/querier/tripperware/queryrange/queryrange.pb.go +++ b/pkg/querier/tripperware/queryrange/queryrange.pb.go @@ -184,38 +184,38 @@ func init() { func init() { proto.RegisterFile("queryrange.proto", fileDescriptor_79b02382e213d0b2) } var fileDescriptor_79b02382e213d0b2 = []byte{ - // 488 bytes of a gzipped FileDescriptorProto + // 485 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xf6, 0x35, 0x8d, 0x4b, 0x2e, 0x52, 0x40, 0x57, 0x54, 0x4c, 0x86, 0x73, 0x14, 0x81, 0x14, + 0x14, 0xf6, 0xd5, 0x8d, 0x4b, 0x2e, 0x52, 0x40, 0x57, 0x54, 0x4c, 0x86, 0xb3, 0x15, 0x81, 0x14, 0x24, 0xb0, 0xa5, 0x20, 0x76, 0x30, 0x50, 0xc1, 0x04, 0x72, 0x90, 0x90, 0xd8, 0xae, 0xe9, 0xc3, 0x35, 0xd4, 0x3e, 0x73, 0x77, 0x56, 0xc9, 0xc6, 0xca, 0xc6, 0xcf, 0xe0, 0xa7, 0x74, 0xcc, 0xc0, - 0xd0, 0xc9, 0x22, 0xce, 0x82, 0x3c, 0xf5, 0x27, 0x20, 0x9f, 0xdd, 0xe6, 0x22, 0x06, 0x36, 0xbf, - 0xcf, 0xdf, 0xf7, 0xee, 0x7d, 0xef, 0x7b, 0xf8, 0xd6, 0x97, 0x1c, 0xc4, 0x42, 0xb0, 0x34, 0x02, - 0x2f, 0x13, 0x5c, 0x71, 0x82, 0x37, 0xc8, 0xf0, 0x76, 0xc4, 0x23, 0xae, 0x61, 0xbf, 0xfe, 0x6a, - 0x18, 0xc3, 0xe7, 0x51, 0xac, 0x4e, 0xf2, 0x23, 0x6f, 0xce, 0x13, 0x7f, 0xce, 0x85, 0x82, 0xaf, - 0x99, 0xe0, 0x9f, 0x60, 0xae, 0xda, 0xca, 0xcf, 0x3e, 0x47, 0x7e, 0xdd, 0x25, 0x06, 0xe1, 0x2b, - 0x11, 0x67, 0x19, 0x88, 0x33, 0x26, 0x40, 0x63, 0x8b, 0xa6, 0xc9, 0xf8, 0x7b, 0x07, 0x93, 0xb7, - 0x82, 0x27, 0xa0, 0x4e, 0x20, 0x97, 0x21, 0xc8, 0x8c, 0xa7, 0x12, 0xc8, 0x18, 0xdb, 0x33, 0xc5, - 0x54, 0x2e, 0x1d, 0x34, 0x42, 0x93, 0x5e, 0x80, 0xab, 0xc2, 0xb5, 0xa5, 0x46, 0xc2, 0xf6, 0x0f, - 0x39, 0xc4, 0xbb, 0x2f, 0x98, 0x62, 0xce, 0xce, 0x08, 0x4d, 0xfa, 0xd3, 0xa1, 0x67, 0x58, 0xd8, - 0x74, 0xac, 0x19, 0xc1, 0xc1, 0x79, 0xe1, 0x5a, 0x55, 0xe1, 0x0e, 0x8e, 0x99, 0x62, 0x0f, 0x79, - 0x12, 0x2b, 0x48, 0x32, 0xb5, 0x08, 0xb5, 0x9e, 0x3c, 0xc1, 0xbd, 0x97, 0x42, 0x70, 0xf1, 0x6e, - 0x91, 0x81, 0xd3, 0xd1, 0xcf, 0xdd, 0xa9, 0x0a, 0x77, 0x1f, 0xae, 0x40, 0x43, 0xb1, 0x61, 0x92, - 0x07, 0xb8, 0xab, 0x0b, 0x67, 0x57, 0x4b, 0xf6, 0xab, 0xc2, 0xbd, 0xa9, 0x25, 0x06, 0xbd, 0x61, - 0x90, 0x43, 0xbc, 0xf7, 0x0a, 0xd8, 0x31, 0x08, 0xe9, 0x74, 0x47, 0x9d, 0x49, 0x7f, 0x7a, 0xdf, - 0x33, 0xf6, 0xe1, 0xfd, 0xeb, 0xbf, 0x61, 0x07, 0xdd, 0xaa, 0x70, 0xd1, 0xa3, 0xf0, 0x4a, 0x4c, - 0xa6, 0xf8, 0xc6, 0x7b, 0x26, 0xd2, 0x38, 0x8d, 0xa4, 0x63, 0x8f, 0x3a, 0x93, 0x5e, 0x70, 0x50, - 0x15, 0x2e, 0x39, 0x6b, 0x31, 0xe3, 0xe1, 0x6b, 0x5e, 0x3d, 0xe6, 0xeb, 0xf4, 0x23, 0x97, 0xce, - 0x9e, 0x16, 0xe8, 0x31, 0xe3, 0x1a, 0x30, 0xc7, 0xd4, 0x8c, 0xf1, 0x2f, 0x84, 0x07, 0xdb, 0x9b, - 0x23, 0x1e, 0xc6, 0x21, 0xc8, 0xfc, 0x54, 0xe9, 0xe5, 0x34, 0x59, 0x0c, 0xaa, 0xc2, 0xc5, 0xe2, - 0x1a, 0x0d, 0x0d, 0x06, 0x79, 0x86, 0xed, 0xa6, 0x72, 0x76, 0xb4, 0xd1, 0xbb, 0x5b, 0x46, 0x67, - 0x2c, 0xc9, 0x4e, 0x61, 0xa6, 0x04, 0xb0, 0x24, 0x18, 0xb4, 0xa1, 0xd8, 0x4d, 0xab, 0xb0, 0x15, - 0x92, 0x37, 0xb8, 0x5b, 0x07, 0x2d, 0x75, 0x14, 0xfd, 0xe9, 0xbd, 0xff, 0xac, 0xaa, 0x3e, 0x06, - 0xd9, 0xd8, 0xd2, 0x32, 0xd3, 0x96, 0x06, 0x82, 0xa7, 0xcb, 0x15, 0xb5, 0x2e, 0x56, 0xd4, 0xba, - 0x5c, 0x51, 0xf4, 0xad, 0xa4, 0xe8, 0x67, 0x49, 0xd1, 0x79, 0x49, 0xd1, 0xb2, 0xa4, 0xe8, 0x77, - 0x49, 0xd1, 0x9f, 0x92, 0x5a, 0x97, 0x25, 0x45, 0x3f, 0xd6, 0xd4, 0x5a, 0xae, 0xa9, 0x75, 0xb1, - 0xa6, 0xd6, 0x07, 0xe3, 0xfe, 0x8f, 0x6c, 0x7d, 0xab, 0x8f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, - 0x7b, 0xf7, 0x21, 0xc5, 0x26, 0x03, 0x00, 0x00, + 0xd0, 0xc9, 0x22, 0xce, 0x82, 0x3c, 0xf5, 0x27, 0x20, 0x9f, 0x9d, 0xc6, 0x15, 0x03, 0x9b, 0xdf, + 0xe7, 0xef, 0x7b, 0xf7, 0xbe, 0xf7, 0x3d, 0x7c, 0xeb, 0x4b, 0x0e, 0x62, 0x21, 0x58, 0x1a, 0x81, + 0x97, 0x09, 0xae, 0x38, 0xc1, 0x5b, 0x64, 0x74, 0x3b, 0xe2, 0x11, 0xd7, 0xb0, 0x5f, 0x7f, 0x35, + 0x8c, 0xd1, 0xf3, 0x28, 0x56, 0x27, 0xf9, 0x91, 0x37, 0xe7, 0x89, 0x3f, 0xe7, 0x42, 0xc1, 0xd7, + 0x4c, 0xf0, 0x4f, 0x30, 0x57, 0x6d, 0xe5, 0x67, 0x9f, 0x23, 0xbf, 0xee, 0x12, 0x83, 0xf0, 0x95, + 0x88, 0xb3, 0x0c, 0xc4, 0x19, 0x13, 0xa0, 0xb1, 0x45, 0xd3, 0x64, 0xfc, 0xdd, 0xc4, 0xe4, 0xad, + 0xe0, 0x09, 0xa8, 0x13, 0xc8, 0x65, 0x08, 0x32, 0xe3, 0xa9, 0x04, 0x32, 0xc6, 0xd6, 0x4c, 0x31, + 0x95, 0x4b, 0x1b, 0xb9, 0x68, 0xd2, 0x0f, 0x70, 0x55, 0x38, 0x96, 0xd4, 0x48, 0xd8, 0xfe, 0x21, + 0x87, 0x78, 0xf7, 0x05, 0x53, 0xcc, 0xde, 0x71, 0xd1, 0x64, 0x30, 0x1d, 0x79, 0x1d, 0x0b, 0xdb, + 0x8e, 0x35, 0x23, 0x38, 0x38, 0x2f, 0x1c, 0xa3, 0x2a, 0x9c, 0xe1, 0x31, 0x53, 0xec, 0x21, 0x4f, + 0x62, 0x05, 0x49, 0xa6, 0x16, 0xa1, 0xd6, 0x93, 0x27, 0xb8, 0xff, 0x52, 0x08, 0x2e, 0xde, 0x2d, + 0x32, 0xb0, 0x4d, 0xfd, 0xdc, 0x9d, 0xaa, 0x70, 0xf6, 0x61, 0x03, 0x76, 0x14, 0x5b, 0x26, 0x79, + 0x80, 0x7b, 0xba, 0xb0, 0x77, 0xb5, 0x64, 0xbf, 0x2a, 0x9c, 0x9b, 0x5a, 0xd2, 0xa1, 0x37, 0x0c, + 0x72, 0x88, 0xf7, 0x5e, 0x01, 0x3b, 0x06, 0x21, 0xed, 0x9e, 0x6b, 0x4e, 0x06, 0xd3, 0xfb, 0x5e, + 0x67, 0x1f, 0xde, 0xbf, 0xfe, 0x1b, 0x76, 0xd0, 0xab, 0x0a, 0x07, 0x3d, 0x0a, 0x37, 0x62, 0x32, + 0xc5, 0x37, 0xde, 0x33, 0x91, 0xc6, 0x69, 0x24, 0x6d, 0xcb, 0x35, 0x27, 0xfd, 0xe0, 0xa0, 0x2a, + 0x1c, 0x72, 0xd6, 0x62, 0x9d, 0x87, 0xaf, 0x78, 0xf5, 0x98, 0xaf, 0xd3, 0x8f, 0x5c, 0xda, 0x7b, + 0xae, 0xb9, 0x19, 0x33, 0xae, 0x81, 0xee, 0x98, 0x9a, 0x31, 0xfe, 0x85, 0xf0, 0xf0, 0xfa, 0xe6, + 0x88, 0x87, 0x71, 0x08, 0x32, 0x3f, 0x55, 0x7a, 0x39, 0x4d, 0x16, 0xc3, 0xaa, 0x70, 0xb0, 0xb8, + 0x42, 0xc3, 0x0e, 0x83, 0x3c, 0xc3, 0x56, 0x53, 0xd9, 0x3b, 0xda, 0xe8, 0xdd, 0x6b, 0x46, 0x67, + 0x2c, 0xc9, 0x4e, 0x61, 0xa6, 0x04, 0xb0, 0x24, 0x18, 0xb6, 0xa1, 0x58, 0x4d, 0xab, 0xb0, 0x15, + 0x92, 0x37, 0xb8, 0x57, 0x07, 0x2d, 0x75, 0x14, 0x83, 0xe9, 0xbd, 0xff, 0xac, 0xaa, 0x3e, 0x06, + 0xd9, 0xd8, 0xd2, 0xb2, 0xae, 0x2d, 0x0d, 0x04, 0x4f, 0x97, 0x2b, 0x6a, 0x5c, 0xac, 0xa8, 0x71, + 0xb9, 0xa2, 0xe8, 0x5b, 0x49, 0xd1, 0xcf, 0x92, 0xa2, 0xf3, 0x92, 0xa2, 0x65, 0x49, 0xd1, 0xef, + 0x92, 0xa2, 0x3f, 0x25, 0x35, 0x2e, 0x4b, 0x8a, 0x7e, 0xac, 0xa9, 0xb1, 0x5c, 0x53, 0xe3, 0x62, + 0x4d, 0x8d, 0x0f, 0x9d, 0xfb, 0x3f, 0xb2, 0xf4, 0xad, 0x3e, 0xfe, 0x3b, 0x00, 0x7b, 0xf7, 0x21, + 0xc5, 0x26, 0x03, 0x00, 0x00, } func (this *PrometheusResponse) Equal(that interface{}) bool { diff --git a/pkg/ring/kv/memberlist/kv.pb.go b/pkg/ring/kv/memberlist/kv.pb.go index 89972934728..a8cda197532 100644 --- a/pkg/ring/kv/memberlist/kv.pb.go +++ b/pkg/ring/kv/memberlist/kv.pb.go @@ -157,7 +157,7 @@ func init() { func init() { proto.RegisterFile("kv.proto", fileDescriptor_2216fe83c9c12408) } var fileDescriptor_2216fe83c9c12408 = []byte{ - // 260 bytes of a gzipped FileDescriptorProto + // 257 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, 0x14, 0x46, 0x7d, 0xff, 0xfc, 0x81, 0xd6, 0x14, 0x09, 0x59, 0x1d, 0x2c, 0x84, 0xae, 0xa2, 0x4e, 0x9e, 0x82, 0x04, 0xec, 0x08, 0x56, 0x16, 0x64, 0x24, 0xf6, 0xb4, 0xbe, 0xaa, 0xa2, 0xa6, 0x72, @@ -173,8 +173,8 @@ var fileDescriptor_2216fe83c9c12408 = []byte{ 0xae, 0x4b, 0x93, 0x79, 0x32, 0x0f, 0x5e, 0xc6, 0x09, 0xa8, 0x48, 0x1f, 0xc5, 0xe3, 0x5d, 0x55, 0x23, 0xdb, 0xd5, 0xc8, 0xf6, 0x35, 0xc2, 0x5b, 0x40, 0xf8, 0x0c, 0x08, 0x5f, 0x01, 0xa1, 0x0a, 0x08, 0xdf, 0x01, 0xe1, 0x27, 0x20, 0xdb, 0x07, 0x84, 0x8f, 0x06, 0x59, 0xd5, 0x20, 0xdb, 0x35, - 0xc8, 0xa6, 0x27, 0xdd, 0x11, 0x6e, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x94, 0xac, 0x1d, - 0x32, 0x01, 0x00, 0x00, + 0xc8, 0xa6, 0x27, 0xdd, 0x11, 0x6e, 0x7f, 0x07, 0x00, 0xf1, 0x94, 0xac, 0x1d, 0x32, 0x01, 0x00, + 0x00, } func (this *KeyValueStore) Equal(that interface{}) bool { diff --git a/pkg/ring/kv/memberlist/memberlist_client_test.go b/pkg/ring/kv/memberlist/memberlist_client_test.go index 601e7438675..f81737edbe0 100644 --- a/pkg/ring/kv/memberlist/memberlist_client_test.go +++ b/pkg/ring/kv/memberlist/memberlist_client_test.go @@ -1308,9 +1308,9 @@ func TestMessageBuffer(t *testing.T) { func TestNotifyMsgResendsOnlyChanges(t *testing.T) { codec := dataCodec{} - cfg := KVConfig{} - // We will be checking for number of messages in the broadcast queue, so make sure to use known retransmit factor. - cfg.RetransmitMult = 1 + cfg := KVConfig{ + // We will be checking for number of messages in the broadcast queue, so make sure to use known retransmit factor. + RetransmitMult: 1} cfg.Codecs = append(cfg.Codecs, codec) kv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) @@ -1370,10 +1370,10 @@ func TestNotifyMsgResendsOnlyChanges(t *testing.T) { func TestSendingOldTombstoneShouldNotForwardMessage(t *testing.T) { codec := dataCodec{} - cfg := KVConfig{} - // We will be checking for number of messages in the broadcast queue, so make sure to use known retransmit factor. - cfg.RetransmitMult = 1 - cfg.LeftIngestersTimeout = 5 * time.Minute + cfg := KVConfig{ + // We will be checking for number of messages in the broadcast queue, so make sure to use known retransmit factor. + RetransmitMult: 1, + LeftIngestersTimeout: 5 * time.Minute} cfg.Codecs = append(cfg.Codecs, codec) kv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) @@ -1462,8 +1462,8 @@ func TestSendingOldTombstoneShouldNotForwardMessage(t *testing.T) { func TestDeleteIsPropagatedToOtherNodes(t *testing.T) { c := dataCodec{} - cfg := KVConfig{} - cfg.RetransmitMult = 1 + cfg := KVConfig{ + RetransmitMult: 1} cfg.Codecs = append(cfg.Codecs, c) mkv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) @@ -1517,8 +1517,8 @@ func TestDeleteIsPropagatedToOtherNodes(t *testing.T) { func TestResurrectDeletedKeyWithNewerMetadata(t *testing.T) { c := dataCodec{} - cfg := KVConfig{} - cfg.RetransmitMult = 1 + cfg := KVConfig{ + RetransmitMult: 1} cfg.Codecs = append(cfg.Codecs, c) mkv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) @@ -1569,8 +1569,8 @@ func TestResurrectDeletedKeyWithNewerMetadata(t *testing.T) { func TestDeleteIdempotencyAndList(t *testing.T) { c := dataCodec{} - cfg := KVConfig{} - cfg.RetransmitMult = 1 + cfg := KVConfig{ + RetransmitMult: 1} cfg.Codecs = append(cfg.Codecs, c) mkv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) @@ -1621,8 +1621,8 @@ func TestDeleteIdempotencyAndList(t *testing.T) { func TestDeleteTriggersWatchKeyNotification(t *testing.T) { c := dataCodec{} - cfg := KVConfig{} - cfg.RetransmitMult = 1 + cfg := KVConfig{ + RetransmitMult: 1} cfg.Codecs = append(cfg.Codecs, c) mkv := NewKV(cfg, log.NewNopLogger(), &dnsProviderMock{}, prometheus.NewPedanticRegistry()) diff --git a/pkg/ring/ring.pb.go b/pkg/ring/ring.pb.go index 87a4c59b542..810d65d7e3f 100644 --- a/pkg/ring/ring.pb.go +++ b/pkg/ring/ring.pb.go @@ -213,7 +213,7 @@ func init() { func init() { proto.RegisterFile("ring.proto", fileDescriptor_26381ed67e202a6e) } var fileDescriptor_26381ed67e202a6e = []byte{ - // 423 bytes of a gzipped FileDescriptorProto + // 419 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0x41, 0x6b, 0xd4, 0x40, 0x1c, 0xc5, 0xe7, 0xbf, 0x99, 0xa4, 0xd9, 0xff, 0xb6, 0x65, 0x98, 0x16, 0x89, 0x45, 0xc6, 0xd0, 0x53, 0xf4, 0xb0, 0xe2, 0xea, 0x41, 0x04, 0x0f, 0x5b, 0x37, 0x4a, 0xc2, 0x92, 0x96, 0xb8, 0x14, @@ -239,8 +239,8 @@ var fileDescriptor_26381ed67e202a6e = []byte{ 0xa2, 0x1d, 0xfb, 0xe3, 0xc9, 0x61, 0x34, 0x7d, 0xcf, 0xcc, 0x83, 0xe7, 0x8b, 0xa5, 0x20, 0x57, 0x4b, 0x41, 0xae, 0x97, 0x02, 0xbe, 0xd7, 0x02, 0x7e, 0xd5, 0x02, 0x2e, 0x6b, 0x01, 0x8b, 0x5a, 0xc0, 0xdf, 0x5a, 0xc0, 0xbf, 0x5a, 0x90, 0xeb, 0x5a, 0xc0, 0x8f, 0x95, 0x20, 0x8b, 0x95, 0x20, - 0x57, 0x2b, 0x41, 0x3e, 0x59, 0xcd, 0x1f, 0xf1, 0xec, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x75, - 0x1d, 0x75, 0xff, 0x3b, 0x02, 0x00, 0x00, + 0x57, 0x2b, 0x41, 0x3e, 0x59, 0xcd, 0x1f, 0xf1, 0xec, 0xff, 0x00, 0x75, 0x1d, 0x75, 0xff, 0x3b, + 0x02, 0x00, 0x00, } func (x InstanceState) String() string { diff --git a/pkg/ruler/ruler.pb.go b/pkg/ruler/ruler.pb.go index c8ca3149fae..f2563131be7 100644 --- a/pkg/ruler/ruler.pb.go +++ b/pkg/ruler/ruler.pb.go @@ -556,62 +556,62 @@ func init() { func init() { proto.RegisterFile("ruler.proto", fileDescriptor_9ecbec0a4cfddea6) } var fileDescriptor_9ecbec0a4cfddea6 = []byte{ - // 880 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0x8f, 0xd3, 0x26, 0x4d, 0x5e, 0xda, 0xae, 0x98, 0x66, 0x57, 0x26, 0x54, 0x6e, 0x15, 0x10, + // 876 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0xb6, 0xd3, 0x3a, 0x4d, 0x5e, 0xda, 0xae, 0x98, 0x66, 0x57, 0x26, 0x54, 0x6e, 0x15, 0x10, 0xaa, 0x90, 0xd6, 0x91, 0xca, 0x4a, 0x88, 0x03, 0x42, 0x29, 0xbb, 0xcb, 0xa5, 0x42, 0x2b, 0x77, - 0xe1, 0x84, 0x14, 0x4d, 0x9c, 0x57, 0xc7, 0xd4, 0xb1, 0xcd, 0xcc, 0x38, 0x0a, 0x37, 0xee, 0x5c, - 0xf6, 0xc8, 0x99, 0x13, 0x67, 0x3e, 0xc5, 0x1e, 0x2b, 0x4e, 0x2b, 0x84, 0x16, 0x9a, 0x5e, 0x38, - 0xee, 0x47, 0x40, 0xf3, 0xc6, 0x6e, 0xe2, 0x12, 0xa4, 0x56, 0xab, 0x5e, 0x92, 0x79, 0x7f, 0x7e, - 0xbf, 0x79, 0xff, 0xe6, 0x19, 0x5a, 0x22, 0x8b, 0x50, 0xb8, 0xa9, 0x48, 0x54, 0xc2, 0x6a, 0x24, - 0x74, 0xda, 0x41, 0x12, 0x24, 0xa4, 0xe9, 0xe9, 0x93, 0x31, 0x76, 0x9c, 0x20, 0x49, 0x82, 0x08, - 0x7b, 0x24, 0x0d, 0xb3, 0xd3, 0xde, 0x28, 0x13, 0x5c, 0x85, 0x49, 0x9c, 0xdb, 0xf7, 0xae, 0xdb, - 0x55, 0x38, 0x41, 0xa9, 0xf8, 0x24, 0xcd, 0x1d, 0x3e, 0x0d, 0x42, 0x35, 0xce, 0x86, 0xae, 0x9f, - 0x4c, 0x7a, 0x7e, 0x22, 0x14, 0xce, 0x52, 0x91, 0x7c, 0x87, 0xbe, 0xca, 0xa5, 0x5e, 0x7a, 0x16, - 0x14, 0x86, 0x61, 0x7e, 0xc8, 0xa1, 0x9f, 0xdd, 0x04, 0x4a, 0xc1, 0xd3, 0xaf, 0x4c, 0x87, 0xe6, - 0xdf, 0xc0, 0xbb, 0xbf, 0x55, 0x61, 0xd3, 0xd3, 0xb2, 0x87, 0xdf, 0x67, 0x28, 0x15, 0xdb, 0x85, - 0xa6, 0xb6, 0x7f, 0xc5, 0x27, 0x28, 0x6d, 0x6b, 0x7f, 0xed, 0xa0, 0xe9, 0x2d, 0x14, 0xec, 0x43, - 0xd8, 0xd6, 0xc2, 0x97, 0x22, 0xc9, 0x52, 0xe3, 0x52, 0x25, 0x97, 0x6b, 0x5a, 0xd6, 0x86, 0xda, - 0x69, 0x18, 0xa1, 0xb4, 0xd7, 0xc8, 0x6c, 0x04, 0xc6, 0x60, 0x5d, 0xfd, 0x90, 0xa2, 0xbd, 0xbe, - 0x6f, 0x1d, 0x34, 0x3d, 0x3a, 0x6b, 0x4f, 0xa9, 0xb8, 0x42, 0xbb, 0x46, 0x4a, 0x23, 0xb0, 0x07, - 0x50, 0x1f, 0x23, 0x8f, 0xd4, 0xd8, 0xae, 0x93, 0x3a, 0x97, 0x58, 0x07, 0x1a, 0x13, 0xae, 0xfc, - 0x31, 0x0a, 0x69, 0x6f, 0x10, 0xf5, 0x95, 0xcc, 0x3e, 0x80, 0x2d, 0x9c, 0xf9, 0x51, 0x36, 0xc2, - 0x7e, 0x84, 0x42, 0x49, 0xbb, 0xb1, 0x6f, 0x1d, 0x34, 0xbc, 0xb2, 0x52, 0x7b, 0x4d, 0xf8, 0xcc, - 0x2b, 0xc2, 0x95, 0x76, 0x73, 0xdf, 0x3a, 0xa8, 0x79, 0x65, 0xa5, 0xae, 0x42, 0x8c, 0x33, 0xf5, - 0x3c, 0x39, 0xc3, 0xd8, 0x06, 0x0a, 0x61, 0xa1, 0xe8, 0x3e, 0x80, 0xf6, 0x71, 0x38, 0xc5, 0x18, - 0xa5, 0xfc, 0x62, 0x8c, 0xfe, 0x59, 0x5e, 0xbb, 0xee, 0x43, 0xb8, 0x7f, 0x4d, 0x2f, 0xd3, 0x24, - 0x96, 0x4b, 0x49, 0x5a, 0x74, 0x99, 0x11, 0xba, 0xdf, 0xc2, 0x56, 0x5e, 0xfa, 0xdc, 0xed, 0x21, - 0xd4, 0x03, 0x13, 0x94, 0x2e, 0x7c, 0xeb, 0xf0, 0xbe, 0x6b, 0x46, 0x90, 0x82, 0x3a, 0xd1, 0x98, - 0xc7, 0x28, 0x7d, 0x2f, 0x77, 0x2a, 0x07, 0x59, 0xbd, 0x1e, 0xe4, 0x2f, 0x55, 0xd8, 0x2e, 0x03, - 0xd9, 0x47, 0x50, 0x23, 0x28, 0x85, 0xd1, 0x3a, 0x6c, 0xbb, 0x66, 0x12, 0xae, 0xf2, 0x26, 0x76, - 0xe3, 0xc2, 0x3e, 0x81, 0x4d, 0xee, 0xab, 0x70, 0x8a, 0x03, 0x72, 0xa2, 0x3e, 0x17, 0x10, 0x41, - 0x90, 0x45, 0x40, 0x2d, 0xe3, 0x49, 0xc9, 0xb0, 0x6f, 0x60, 0x07, 0xa7, 0x3c, 0xca, 0xe8, 0x01, - 0x3c, 0x2f, 0x06, 0xdd, 0x5e, 0xa3, 0x2b, 0x3b, 0xae, 0x79, 0x0a, 0x6e, 0xf1, 0x14, 0xdc, 0x2b, - 0x8f, 0xa3, 0xc6, 0xcb, 0xd7, 0x7b, 0x95, 0x17, 0x7f, 0xed, 0x59, 0xde, 0x2a, 0x02, 0x76, 0x02, - 0x6c, 0xa1, 0x7e, 0x9c, 0x3f, 0x30, 0x1a, 0xa5, 0xd6, 0xe1, 0xbb, 0xff, 0xa1, 0x2d, 0x1c, 0x0c, - 0xeb, 0xcf, 0x9a, 0x75, 0x05, 0xbc, 0xfb, 0x67, 0xd5, 0xf4, 0x60, 0x51, 0xa3, 0xf7, 0x61, 0x5d, - 0xa7, 0x98, 0x97, 0xe8, 0xde, 0x52, 0x89, 0x28, 0x55, 0x32, 0x2e, 0xfa, 0x59, 0x5d, 0x3d, 0xb4, - 0x6b, 0xa5, 0xa1, 0xdd, 0x85, 0x66, 0xc4, 0xa5, 0x7a, 0x22, 0x44, 0x22, 0xf2, 0xd9, 0x5f, 0x28, - 0x74, 0xd3, 0xb9, 0x99, 0xd7, 0x5a, 0xa9, 0xe9, 0x34, 0xaf, 0x4b, 0x4d, 0x37, 0x4e, 0xff, 0x57, - 0xde, 0xfa, 0xdd, 0x94, 0x77, 0xe3, 0xed, 0xca, 0xfb, 0x7b, 0x0d, 0xb6, 0xcb, 0x79, 0x94, 0x9f, - 0xc2, 0x55, 0xe9, 0x62, 0xa8, 0x47, 0x7c, 0x88, 0x51, 0x31, 0x67, 0x3b, 0x6e, 0xb1, 0xed, 0xdc, - 0x63, 0xad, 0x7f, 0xc6, 0x43, 0x71, 0xd4, 0xd7, 0x77, 0xfd, 0xf1, 0x7a, 0xef, 0x56, 0xdb, 0xd2, - 0xe0, 0xfb, 0x23, 0x9e, 0x2a, 0x14, 0x5e, 0x7e, 0x0b, 0x9b, 0x41, 0x8b, 0xc7, 0x71, 0xa2, 0x28, - 0x4c, 0xb3, 0xa5, 0xee, 0xee, 0xd2, 0xe5, 0xab, 0x74, 0xfe, 0xba, 0x4e, 0x66, 0x09, 0x5a, 0x9e, - 0x11, 0x58, 0x1f, 0x9a, 0xf9, 0x6b, 0xe3, 0x8a, 0x36, 0xe1, 0x4d, 0x7b, 0xd9, 0x30, 0xb0, 0xbe, - 0x62, 0x9f, 0x43, 0xe3, 0x34, 0x14, 0x38, 0xd2, 0x0c, 0xb7, 0x99, 0x86, 0x0d, 0x42, 0xf5, 0x15, - 0x7b, 0x02, 0x2d, 0x81, 0x32, 0x89, 0xa6, 0x86, 0x63, 0xe3, 0x16, 0x1c, 0x50, 0x00, 0xfb, 0x8a, - 0x3d, 0x85, 0x4d, 0x3d, 0xdc, 0x03, 0x89, 0xb1, 0xd2, 0x3c, 0x8d, 0xdb, 0xf0, 0x68, 0xe4, 0x09, - 0xc6, 0xca, 0x84, 0x33, 0xe5, 0x51, 0x38, 0x1a, 0x64, 0xb1, 0x0a, 0x23, 0x5a, 0xd3, 0x37, 0xa6, - 0x21, 0xe0, 0xd7, 0x1a, 0xc7, 0x9e, 0xc1, 0x3b, 0x67, 0x88, 0xe9, 0xe0, 0x34, 0x14, 0x61, 0x1c, - 0x0c, 0x64, 0x18, 0xfb, 0x48, 0x1b, 0xfd, 0xa6, 0x64, 0xf7, 0x34, 0xfc, 0x29, 0xa1, 0x4f, 0x34, - 0xf8, 0xf0, 0x27, 0x0b, 0x6a, 0x7a, 0x1f, 0x08, 0xf6, 0xc8, 0x1c, 0x24, 0xdb, 0x59, 0x5a, 0x8b, - 0xc5, 0x97, 0xb4, 0xd3, 0x2e, 0x2b, 0xcd, 0x8e, 0xef, 0x56, 0xd8, 0x31, 0x6c, 0x95, 0xbe, 0x12, - 0xec, 0xbd, 0xdc, 0x71, 0xd5, 0x37, 0xa5, 0xb3, 0xbb, 0xda, 0x58, 0xb0, 0x1d, 0x3d, 0x3a, 0xbf, - 0x70, 0x2a, 0xaf, 0x2e, 0x9c, 0xca, 0x9b, 0x0b, 0xc7, 0xfa, 0x71, 0xee, 0x58, 0xbf, 0xce, 0x1d, - 0xeb, 0xe5, 0xdc, 0xb1, 0xce, 0xe7, 0x8e, 0xf5, 0xf7, 0xdc, 0xb1, 0xfe, 0x99, 0x3b, 0x95, 0x37, - 0x73, 0xc7, 0x7a, 0x71, 0xe9, 0x54, 0xce, 0x2f, 0x9d, 0xca, 0xab, 0x4b, 0xa7, 0x32, 0xac, 0x53, - 0xca, 0x1f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x29, 0x54, 0x5d, 0xa5, 0xe4, 0x08, 0x00, 0x00, + 0xe1, 0x84, 0x14, 0x4d, 0x9c, 0x57, 0xc7, 0xd4, 0xf1, 0x98, 0x99, 0x71, 0x14, 0x6e, 0xdc, 0xb9, + 0xec, 0x91, 0x33, 0x27, 0xce, 0xfc, 0x8a, 0x3d, 0x56, 0x9c, 0x56, 0x08, 0x2d, 0x34, 0xbd, 0x70, + 0xdc, 0x9f, 0x80, 0x66, 0xc6, 0x6e, 0xe2, 0x12, 0x24, 0x22, 0xd4, 0x4b, 0x32, 0xef, 0xbd, 0xef, + 0xfb, 0xe6, 0xbd, 0x37, 0x6f, 0xc6, 0xd0, 0xe2, 0x79, 0x82, 0xdc, 0xcf, 0x38, 0x93, 0x8c, 0x38, + 0xda, 0xe8, 0xb4, 0x23, 0x16, 0x31, 0xed, 0xe9, 0xa9, 0x95, 0x09, 0x76, 0xbc, 0x88, 0xb1, 0x28, + 0xc1, 0x9e, 0xb6, 0x86, 0xf9, 0x79, 0x6f, 0x94, 0x73, 0x2a, 0x63, 0x96, 0x16, 0xf1, 0x83, 0xdb, + 0x71, 0x19, 0x4f, 0x50, 0x48, 0x3a, 0xc9, 0x0a, 0xc0, 0xc7, 0x51, 0x2c, 0xc7, 0xf9, 0xd0, 0x0f, + 0xd9, 0xa4, 0x17, 0x32, 0x2e, 0x71, 0x96, 0x71, 0xf6, 0x0d, 0x86, 0xb2, 0xb0, 0x7a, 0xd9, 0x45, + 0x54, 0x06, 0x86, 0xc5, 0xa2, 0xa0, 0x7e, 0xf2, 0x5f, 0xa8, 0x3a, 0x79, 0xfd, 0x2b, 0xb2, 0xa1, + 0xf9, 0x37, 0xf4, 0xee, 0x2f, 0x35, 0xd8, 0x0e, 0x94, 0x1d, 0xe0, 0xb7, 0x39, 0x0a, 0x49, 0xf6, + 0xa1, 0xa9, 0xe2, 0x5f, 0xd0, 0x09, 0x0a, 0xd7, 0x3e, 0xdc, 0x38, 0x6a, 0x06, 0x0b, 0x07, 0x79, + 0x1f, 0x76, 0x95, 0xf1, 0x39, 0x67, 0x79, 0x66, 0x20, 0x35, 0x0d, 0xb9, 0xe5, 0x25, 0x6d, 0x70, + 0xce, 0xe3, 0x04, 0x85, 0xbb, 0xa1, 0xc3, 0xc6, 0x20, 0x04, 0x36, 0xe5, 0x77, 0x19, 0xba, 0x9b, + 0x87, 0xf6, 0x51, 0x33, 0xd0, 0x6b, 0x85, 0x14, 0x92, 0x4a, 0x74, 0x1d, 0xed, 0x34, 0x06, 0x79, + 0x00, 0xf5, 0x31, 0xd2, 0x44, 0x8e, 0xdd, 0xba, 0x76, 0x17, 0x16, 0xe9, 0x40, 0x63, 0x42, 0x65, + 0x38, 0x46, 0x2e, 0xdc, 0x2d, 0x2d, 0x7d, 0x63, 0x93, 0xf7, 0x60, 0x07, 0x67, 0x61, 0x92, 0x8f, + 0xb0, 0x9f, 0x20, 0x97, 0xc2, 0x6d, 0x1c, 0xda, 0x47, 0x8d, 0xa0, 0xea, 0x54, 0xa8, 0x09, 0x9d, + 0x05, 0x65, 0xba, 0xc2, 0x6d, 0x1e, 0xda, 0x47, 0x4e, 0x50, 0x75, 0xaa, 0x2e, 0xa4, 0x38, 0x93, + 0xcf, 0xd9, 0x05, 0xa6, 0x2e, 0xe8, 0x14, 0x16, 0x8e, 0xee, 0x03, 0x68, 0x9f, 0xc6, 0x53, 0x4c, + 0x51, 0x88, 0xcf, 0xc6, 0x18, 0x5e, 0x14, 0xbd, 0xeb, 0x3e, 0x84, 0xfb, 0xb7, 0xfc, 0x22, 0x63, + 0xa9, 0x58, 0x2a, 0xd2, 0xd6, 0x9b, 0x19, 0xa3, 0xfb, 0x35, 0xec, 0x14, 0xad, 0x2f, 0x60, 0x0f, + 0xa1, 0x1e, 0x99, 0xa4, 0x54, 0xe3, 0x5b, 0xc7, 0xf7, 0x7d, 0x33, 0x82, 0x3a, 0xa9, 0x33, 0xc5, + 0x79, 0x8c, 0x22, 0x0c, 0xea, 0xd1, 0x8a, 0x24, 0x6b, 0xb7, 0x93, 0xfc, 0xa9, 0x06, 0xbb, 0x55, + 0x22, 0xf9, 0x00, 0x1c, 0x4d, 0xd5, 0x69, 0xb4, 0x8e, 0xdb, 0xbe, 0x99, 0x84, 0x9b, 0xba, 0xb5, + 0xba, 0x81, 0x90, 0x8f, 0x60, 0x9b, 0x86, 0x32, 0x9e, 0xe2, 0x40, 0x83, 0xf4, 0x39, 0x97, 0x14, + 0xae, 0x29, 0x8b, 0x84, 0x5a, 0x06, 0xa9, 0x8b, 0x21, 0x5f, 0xc1, 0x1e, 0x4e, 0x69, 0x92, 0xeb, + 0x0b, 0xf0, 0xbc, 0x1c, 0x74, 0x77, 0x43, 0x6f, 0xd9, 0xf1, 0xcd, 0x55, 0xf0, 0xcb, 0xab, 0xe0, + 0xdf, 0x20, 0x4e, 0x1a, 0x2f, 0x5f, 0x1f, 0x58, 0x2f, 0xfe, 0x38, 0xb0, 0x83, 0x55, 0x02, 0xe4, + 0x0c, 0xc8, 0xc2, 0xfd, 0xb8, 0xb8, 0x60, 0x7a, 0x94, 0x5a, 0xc7, 0x6f, 0xff, 0x43, 0xb6, 0x04, + 0x18, 0xd5, 0x1f, 0x95, 0xea, 0x0a, 0x7a, 0xf7, 0xf7, 0x1a, 0xec, 0x54, 0x6a, 0x21, 0xef, 0xc2, + 0xa6, 0x2a, 0xb1, 0x68, 0xd1, 0xbd, 0xa5, 0x16, 0xe9, 0x52, 0x75, 0x70, 0x71, 0x9e, 0xb5, 0xd5, + 0x43, 0xbb, 0x51, 0x19, 0xda, 0x7d, 0x68, 0x26, 0x54, 0xc8, 0x27, 0x9c, 0x33, 0x5e, 0xcc, 0xfe, + 0xc2, 0xa1, 0x0e, 0x9d, 0x9a, 0x79, 0x75, 0x2a, 0x87, 0xae, 0xe7, 0x75, 0xe9, 0xd0, 0x0d, 0xe8, + 0xdf, 0xda, 0x5b, 0xbf, 0x9b, 0xf6, 0x6e, 0xfd, 0xbf, 0xf6, 0xfe, 0xea, 0xc0, 0x6e, 0xb5, 0x8e, + 0xea, 0x55, 0xb8, 0x69, 0x5d, 0x0a, 0xf5, 0x84, 0x0e, 0x31, 0x29, 0xe7, 0x6c, 0xcf, 0x2f, 0x5f, + 0x3b, 0xff, 0x54, 0xf9, 0x9f, 0xd1, 0x98, 0x9f, 0xf4, 0xd5, 0x5e, 0xbf, 0xbd, 0x3e, 0x58, 0xeb, + 0xb5, 0x34, 0xfc, 0xfe, 0x88, 0x66, 0x12, 0x79, 0x50, 0xec, 0x42, 0x66, 0xd0, 0xa2, 0x69, 0xca, + 0xa4, 0x4e, 0xd3, 0xbc, 0x52, 0x77, 0xb7, 0xe9, 0xf2, 0x56, 0xaa, 0x7e, 0xd5, 0x27, 0xf3, 0x08, + 0xda, 0x81, 0x31, 0x48, 0x1f, 0x9a, 0xc5, 0x6d, 0xa3, 0xd2, 0x75, 0xd6, 0x38, 0xcb, 0x86, 0xa1, + 0xf5, 0x25, 0xf9, 0x14, 0x1a, 0xe7, 0x31, 0xc7, 0x91, 0x52, 0x58, 0x67, 0x1a, 0xb6, 0x34, 0xab, + 0x2f, 0xc9, 0x13, 0x68, 0x71, 0x14, 0x2c, 0x99, 0x1a, 0x8d, 0xad, 0x35, 0x34, 0xa0, 0x24, 0xf6, + 0x25, 0x79, 0x0a, 0xdb, 0x6a, 0xb8, 0x07, 0x02, 0x53, 0xa9, 0x74, 0x1a, 0xeb, 0xe8, 0x28, 0xe6, + 0x19, 0xa6, 0xd2, 0xa4, 0x33, 0xa5, 0x49, 0x3c, 0x1a, 0xe4, 0xa9, 0x8c, 0x13, 0xb7, 0xb9, 0x8e, + 0x8c, 0x26, 0x7e, 0xa9, 0x78, 0xe4, 0x19, 0xbc, 0x75, 0x81, 0x98, 0x0d, 0xce, 0x63, 0x1e, 0xa7, + 0xd1, 0x40, 0xc4, 0x69, 0x88, 0x2e, 0xac, 0x21, 0x76, 0x4f, 0xd1, 0x9f, 0x6a, 0xf6, 0x99, 0x22, + 0x1f, 0xff, 0x60, 0x83, 0xa3, 0xde, 0x03, 0x4e, 0x1e, 0x99, 0x85, 0x20, 0x7b, 0x4b, 0xcf, 0x62, + 0xf9, 0x25, 0xed, 0xb4, 0xab, 0x4e, 0xf3, 0xc6, 0x77, 0x2d, 0x72, 0x0a, 0x3b, 0x95, 0xaf, 0x04, + 0x79, 0xa7, 0x00, 0xae, 0xfa, 0xa6, 0x74, 0xf6, 0x57, 0x07, 0x4b, 0xb5, 0x93, 0x47, 0x97, 0x57, + 0x9e, 0xf5, 0xea, 0xca, 0xb3, 0xde, 0x5c, 0x79, 0xf6, 0xf7, 0x73, 0xcf, 0xfe, 0x79, 0xee, 0xd9, + 0x2f, 0xe7, 0x9e, 0x7d, 0x39, 0xf7, 0xec, 0x3f, 0xe7, 0x9e, 0xfd, 0xd7, 0xdc, 0xb3, 0xde, 0xcc, + 0x3d, 0xfb, 0xc5, 0xb5, 0x67, 0x5d, 0x5e, 0x7b, 0xd6, 0xab, 0x6b, 0xcf, 0x1a, 0xd6, 0x75, 0xc9, + 0x1f, 0xfe, 0x3d, 0x00, 0x29, 0x54, 0x5d, 0xa5, 0xe4, 0x08, 0x00, 0x00, } func (this *RulesRequest) Equal(that interface{}) bool { diff --git a/pkg/ruler/rulespb/rules.pb.go b/pkg/ruler/rulespb/rules.pb.go index dbb1c7190af..6a7aef6327c 100644 --- a/pkg/ruler/rulespb/rules.pb.go +++ b/pkg/ruler/rulespb/rules.pb.go @@ -223,42 +223,42 @@ func init() { func init() { proto.RegisterFile("rules.proto", fileDescriptor_8e722d3e922f0937) } var fileDescriptor_8e722d3e922f0937 = []byte{ - // 554 bytes of a gzipped FileDescriptorProto + // 551 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x31, 0x6f, 0xd3, 0x40, 0x18, 0xf5, 0x61, 0xc7, 0x75, 0xce, 0x44, 0xad, 0x8e, 0x08, 0xb9, 0x05, 0x5d, 0xa2, 0x4a, 0x48, 0x99, 0x1c, 0xa9, 0x88, 0x81, 0x01, 0xa1, 0x44, 0xa5, 0x48, 0x11, 0x12, 0xc8, 0x23, 0x42, 0xaa, - 0x6c, 0xe7, 0x6c, 0x4c, 0x1d, 0x9f, 0x39, 0x9f, 0x51, 0xb3, 0xf1, 0x13, 0x18, 0xf9, 0x09, 0xfc, - 0x94, 0x0e, 0x0c, 0x61, 0xab, 0x18, 0x02, 0x71, 0x16, 0xc4, 0xd4, 0x9f, 0x80, 0xee, 0xce, 0x86, - 0x00, 0x03, 0x65, 0x80, 0x29, 0xdf, 0x77, 0xef, 0xde, 0x7d, 0xef, 0x7b, 0x2f, 0x86, 0x36, 0x2b, - 0x53, 0x52, 0xb8, 0x39, 0xa3, 0x9c, 0xa2, 0x96, 0x6c, 0xf6, 0xba, 0x31, 0x8d, 0xa9, 0x3c, 0x19, - 0x8a, 0x4a, 0x81, 0x7b, 0x38, 0xa6, 0x34, 0x4e, 0xc9, 0x50, 0x76, 0x41, 0x19, 0x0d, 0xa7, 0x25, - 0xf3, 0x79, 0x42, 0xb3, 0x1a, 0xdf, 0xfd, 0x15, 0xf7, 0xb3, 0x79, 0x0d, 0xdd, 0x8d, 0x13, 0xfe, - 0xbc, 0x0c, 0xdc, 0x90, 0xce, 0x86, 0x21, 0x65, 0x9c, 0x9c, 0xe6, 0x8c, 0xbe, 0x20, 0x21, 0xaf, - 0xbb, 0x61, 0x7e, 0x12, 0x37, 0x40, 0x50, 0x17, 0x8a, 0xba, 0xff, 0x5e, 0x87, 0x1d, 0xaf, 0x4c, - 0xc9, 0x43, 0x46, 0xcb, 0xfc, 0x90, 0x14, 0x21, 0x42, 0xd0, 0xc8, 0xfc, 0x19, 0x71, 0x40, 0x1f, - 0x0c, 0xda, 0x9e, 0xac, 0xd1, 0x4d, 0xd8, 0x16, 0xbf, 0x45, 0xee, 0x87, 0xc4, 0xb9, 0x22, 0x81, - 0x1f, 0x07, 0xe8, 0x3e, 0xb4, 0x92, 0x8c, 0x13, 0xf6, 0xca, 0x4f, 0x1d, 0xbd, 0x0f, 0x06, 0xf6, - 0xc1, 0xae, 0xab, 0xc4, 0xba, 0x8d, 0x58, 0xf7, 0xb0, 0x5e, 0x66, 0x6c, 0x9d, 0x2d, 0x7b, 0xda, - 0xdb, 0x4f, 0x3d, 0xe0, 0x7d, 0x27, 0xa1, 0x5b, 0x50, 0x39, 0xe3, 0x18, 0x7d, 0x7d, 0x60, 0x1f, - 0x6c, 0xbb, 0xca, 0x34, 0xa1, 0x4b, 0x48, 0xf2, 0x14, 0x2a, 0x94, 0x95, 0x05, 0x61, 0x8e, 0xa9, - 0x94, 0x89, 0x1a, 0xb9, 0x70, 0x8b, 0xe6, 0xe2, 0xe1, 0xc2, 0x69, 0x4b, 0x72, 0xf7, 0xb7, 0xd1, - 0xa3, 0x6c, 0xee, 0x35, 0x97, 0x50, 0x17, 0xb6, 0xd2, 0x64, 0x96, 0x70, 0x07, 0xf6, 0xc1, 0x40, - 0xf7, 0x54, 0x83, 0x1e, 0x40, 0xfb, 0x65, 0x49, 0xd8, 0xfc, 0x71, 0x14, 0x15, 0x84, 0x3b, 0xf6, - 0x65, 0x96, 0x00, 0x72, 0x89, 0x4d, 0x1e, 0xca, 0xa0, 0x99, 0xfa, 0x01, 0x49, 0x0b, 0xe7, 0xaa, - 0xd4, 0x72, 0xcd, 0x6d, 0x4c, 0x77, 0x1f, 0x89, 0xf3, 0x27, 0x7e, 0xc2, 0xc6, 0x23, 0x61, 0xc0, - 0xc7, 0x65, 0xef, 0xaf, 0x42, 0x53, 0xfc, 0xd1, 0xd4, 0xcf, 0x39, 0x61, 0x5e, 0x3d, 0x65, 0x62, - 0x58, 0xad, 0x1d, 0x73, 0x62, 0x58, 0x5b, 0x3b, 0xd6, 0xc4, 0xb0, 0xac, 0x9d, 0xf6, 0xfe, 0x07, - 0x1d, 0x5a, 0x8d, 0x6d, 0xc2, 0x2f, 0xf1, 0x68, 0x93, 0xa4, 0xa8, 0xd1, 0x75, 0x68, 0x32, 0x12, - 0x52, 0x36, 0xad, 0x63, 0xac, 0x3b, 0xe1, 0x8b, 0x9f, 0x12, 0xc6, 0x65, 0x80, 0x6d, 0x4f, 0x35, - 0xe8, 0x0e, 0xd4, 0x23, 0xca, 0x1c, 0xe3, 0xf2, 0xa1, 0x8a, 0xfb, 0x1b, 0x3e, 0xb4, 0xfe, 0x87, - 0x0f, 0xe8, 0x14, 0xda, 0x7e, 0x96, 0x51, 0xee, 0xab, 0x3f, 0x82, 0xf9, 0x4f, 0x87, 0x6e, 0x8e, - 0x42, 0xcf, 0x60, 0xe7, 0x84, 0x90, 0xfc, 0x28, 0x61, 0x49, 0x16, 0x1f, 0x51, 0xe6, 0x74, 0xfe, - 0x64, 0xd5, 0x0d, 0xa1, 0xe0, 0xeb, 0xb2, 0xb7, 0x2d, 0x78, 0xc7, 0x91, 0x24, 0x1e, 0x47, 0x94, - 0x49, 0xf7, 0x7e, 0x7e, 0x4c, 0x26, 0xdb, 0x19, 0xdf, 0x5b, 0xac, 0xb0, 0x76, 0xbe, 0xc2, 0xda, - 0xc5, 0x0a, 0x83, 0xd7, 0x15, 0x06, 0xef, 0x2a, 0x0c, 0xce, 0x2a, 0x0c, 0x16, 0x15, 0x06, 0x9f, - 0x2b, 0x0c, 0xbe, 0x54, 0x58, 0xbb, 0xa8, 0x30, 0x78, 0xb3, 0xc6, 0xda, 0x62, 0x8d, 0xb5, 0xf3, - 0x35, 0xd6, 0x9e, 0x6e, 0xc9, 0x6f, 0x26, 0x0f, 0x02, 0x53, 0x6a, 0xb8, 0xfd, 0x2d, 0x00, 0x00, - 0xff, 0xff, 0x39, 0x21, 0xc0, 0xef, 0x8a, 0x04, 0x00, 0x00, + 0xce, 0xce, 0xd9, 0x98, 0x3a, 0x3e, 0x73, 0x3e, 0xa3, 0x66, 0xe3, 0x27, 0x30, 0xf2, 0x13, 0xf8, + 0x29, 0x1d, 0x18, 0xc2, 0x56, 0x31, 0x04, 0xe2, 0x2c, 0x88, 0xa9, 0x3f, 0x01, 0xdd, 0xd9, 0x86, + 0x00, 0x03, 0x65, 0x80, 0x29, 0xdf, 0xbb, 0x77, 0xef, 0xbe, 0xf7, 0xbd, 0x2f, 0x86, 0x36, 0x2f, + 0x12, 0x9a, 0xbb, 0x19, 0x67, 0x82, 0xa1, 0x96, 0x02, 0x7b, 0xdd, 0x88, 0x45, 0x4c, 0x9d, 0x0c, + 0x65, 0x55, 0x91, 0x7b, 0x38, 0x62, 0x2c, 0x4a, 0xe8, 0x50, 0x21, 0xbf, 0x08, 0x87, 0xd3, 0x82, + 0x13, 0x11, 0xb3, 0xb4, 0xe6, 0x77, 0x7f, 0xe5, 0x49, 0x3a, 0xaf, 0xa9, 0xbb, 0x51, 0x2c, 0x9e, + 0x17, 0xbe, 0x1b, 0xb0, 0xd9, 0x30, 0x60, 0x5c, 0xd0, 0xd3, 0x8c, 0xb3, 0x17, 0x34, 0x10, 0x35, + 0x1a, 0x66, 0x27, 0x51, 0x43, 0xf8, 0x75, 0x51, 0x49, 0xf7, 0xdf, 0xeb, 0xb0, 0xe3, 0x15, 0x09, + 0x7d, 0xc8, 0x59, 0x91, 0x1d, 0xd2, 0x3c, 0x40, 0x08, 0x1a, 0x29, 0x99, 0x51, 0x07, 0xf4, 0xc1, + 0xa0, 0xed, 0xa9, 0x1a, 0xdd, 0x84, 0x6d, 0xf9, 0x9b, 0x67, 0x24, 0xa0, 0xce, 0x15, 0x45, 0xfc, + 0x38, 0x40, 0xf7, 0xa1, 0x15, 0xa7, 0x82, 0xf2, 0x57, 0x24, 0x71, 0xf4, 0x3e, 0x18, 0xd8, 0x07, + 0xbb, 0x6e, 0x65, 0xd6, 0x6d, 0xcc, 0xba, 0x87, 0xf5, 0x30, 0x63, 0xeb, 0x6c, 0xd9, 0xd3, 0xde, + 0x7e, 0xea, 0x01, 0xef, 0xbb, 0x08, 0xdd, 0x82, 0x55, 0x32, 0x8e, 0xd1, 0xd7, 0x07, 0xf6, 0xc1, + 0xb6, 0xab, 0x90, 0x2b, 0x7d, 0x49, 0x4b, 0x5e, 0xc5, 0x4a, 0x67, 0x45, 0x4e, 0xb9, 0x63, 0x56, + 0xce, 0x64, 0x8d, 0x5c, 0xb8, 0xc5, 0x32, 0xf9, 0x70, 0xee, 0xb4, 0x95, 0xb8, 0xfb, 0x5b, 0xeb, + 0x51, 0x3a, 0xf7, 0x9a, 0x4b, 0xa8, 0x0b, 0x5b, 0x49, 0x3c, 0x8b, 0x85, 0x03, 0xfb, 0x60, 0xa0, + 0x7b, 0x15, 0x40, 0x0f, 0xa0, 0xfd, 0xb2, 0xa0, 0x7c, 0xfe, 0x38, 0x0c, 0x73, 0x2a, 0x1c, 0xfb, + 0x32, 0x43, 0x00, 0x35, 0xc4, 0xa6, 0x0e, 0xa5, 0xd0, 0x4c, 0x88, 0x4f, 0x93, 0xdc, 0xb9, 0xaa, + 0xbc, 0x5c, 0x73, 0x9b, 0xd0, 0xdd, 0x47, 0xf2, 0xfc, 0x09, 0x89, 0xf9, 0x78, 0x24, 0x03, 0xf8, + 0xb8, 0xec, 0xfd, 0xd5, 0xd2, 0x2a, 0xfd, 0x68, 0x4a, 0x32, 0x41, 0xb9, 0x57, 0x77, 0x99, 0x18, + 0x56, 0x6b, 0xc7, 0x9c, 0x18, 0xd6, 0xd6, 0x8e, 0x35, 0x31, 0x2c, 0x6b, 0xa7, 0xbd, 0xff, 0x41, + 0x87, 0x56, 0x13, 0x9b, 0xcc, 0x4b, 0x3e, 0xda, 0x6c, 0x52, 0xd6, 0xe8, 0x3a, 0x34, 0x39, 0x0d, + 0x18, 0x9f, 0xd6, 0x6b, 0xac, 0x91, 0xcc, 0x85, 0x24, 0x94, 0x0b, 0xb5, 0xc0, 0xb6, 0x57, 0x01, + 0x74, 0x07, 0xea, 0x21, 0xe3, 0x8e, 0x71, 0xf9, 0xa5, 0xca, 0xfb, 0x1b, 0x39, 0xb4, 0xfe, 0x47, + 0x0e, 0xe8, 0x14, 0xda, 0x24, 0x4d, 0x99, 0x20, 0xd5, 0x1f, 0xc1, 0xfc, 0xa7, 0x4d, 0x37, 0x5b, + 0xa1, 0x67, 0xb0, 0x73, 0x42, 0x69, 0x76, 0x14, 0xf3, 0x38, 0x8d, 0x8e, 0x18, 0x77, 0x3a, 0x7f, + 0x8a, 0xea, 0x86, 0x74, 0xf0, 0x75, 0xd9, 0xdb, 0x96, 0xba, 0xe3, 0x50, 0x09, 0x8f, 0x43, 0xc6, + 0x55, 0x7a, 0x3f, 0x3f, 0xa6, 0x36, 0xdb, 0x19, 0xdf, 0x5b, 0xac, 0xb0, 0x76, 0xbe, 0xc2, 0xda, + 0xc5, 0x0a, 0x83, 0xd7, 0x25, 0x06, 0xef, 0x4a, 0x0c, 0xce, 0x4a, 0x0c, 0x16, 0x25, 0x06, 0x9f, + 0x4b, 0x0c, 0xbe, 0x94, 0x58, 0xbb, 0x28, 0x31, 0x78, 0xb3, 0xc6, 0xda, 0x62, 0x8d, 0xb5, 0xf3, + 0x35, 0xd6, 0x9e, 0x6e, 0xa9, 0x6f, 0x26, 0xf3, 0x7d, 0x53, 0x79, 0xb8, 0xfd, 0x6d, 0x00, 0x39, + 0x21, 0xc0, 0xef, 0x8a, 0x04, 0x00, 0x00, } func (this *RuleGroupDesc) Equal(that interface{}) bool { diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index f2b449f7c78..2bc2c70dcf6 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -25,7 +25,6 @@ import ( "github.com/cortexproject/cortex/pkg/distributed_execution" frontendv1 "github.com/cortexproject/cortex/pkg/frontend/v1" "github.com/cortexproject/cortex/pkg/frontend/v2/frontendv2pb" - "github.com/cortexproject/cortex/pkg/scheduler/queue" "github.com/cortexproject/cortex/pkg/scheduler/schedulerpb" "github.com/cortexproject/cortex/pkg/util/flagext" "github.com/cortexproject/cortex/pkg/util/httpgrpcutil" @@ -38,7 +37,7 @@ const testMaxOutstandingPerTenant = 5 func setupScheduler(t *testing.T, reg prometheus.Registerer, distributedExecEnabled bool) (*Scheduler, schedulerpb.SchedulerForFrontendClient, schedulerpb.SchedulerForQuerierClient) { cfg := Config{} flagext.DefaultValues(&cfg) - s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: testMaxOutstandingPerTenant}}, log.NewNopLogger(), reg, distributedExecEnabled) + s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MaxOutstanding: testMaxOutstandingPerTenant}, log.NewNopLogger(), reg, distributedExecEnabled) require.NoError(t, err) server := grpc.NewServer() @@ -703,7 +702,7 @@ func (f *frontendMock) getRequest(queryID uint64) *httpgrpc.HTTPResponse { func TestQueryFragmentRegistryCleanupSingleFragment(t *testing.T) { cfg := Config{} flagext.DefaultValues(&cfg) - s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: testMaxOutstandingPerTenant}}, log.NewNopLogger(), nil, false) + s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MaxOutstanding: testMaxOutstandingPerTenant}, log.NewNopLogger(), nil, false) require.NoError(t, err) frontendAddr := "frontend1" @@ -750,7 +749,7 @@ func TestQueryFragmentRegistryCleanupSingleFragment(t *testing.T) { func TestQueryFragmentRegistryCleanupMultipleFragments(t *testing.T) { cfg := Config{} flagext.DefaultValues(&cfg) - s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: testMaxOutstandingPerTenant}}, log.NewNopLogger(), nil, true) + s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MaxOutstanding: testMaxOutstandingPerTenant}, log.NewNopLogger(), nil, true) require.NoError(t, err) frontendAddr := "frontend1" @@ -842,7 +841,7 @@ func TestQueryFragmentRegistryCleanupMultipleFragments(t *testing.T) { func TestQueryFragmentRegistryNoLeak(t *testing.T) { cfg := Config{} flagext.DefaultValues(&cfg) - s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MockLimits: queue.MockLimits{MaxOutstanding: testMaxOutstandingPerTenant}}, log.NewNopLogger(), nil, false) + s, err := NewScheduler(cfg, frontendv1.MockLimits{Queriers: 2, MaxOutstanding: testMaxOutstandingPerTenant}, log.NewNopLogger(), nil, false) require.NoError(t, err) frontendAddr := "frontend1" diff --git a/pkg/scheduler/schedulerpb/scheduler.pb.go b/pkg/scheduler/schedulerpb/scheduler.pb.go index 7ba5f7774b1..7884e696476 100644 --- a/pkg/scheduler/schedulerpb/scheduler.pb.go +++ b/pkg/scheduler/schedulerpb/scheduler.pb.go @@ -476,7 +476,7 @@ func init() { func init() { proto.RegisterFile("scheduler.proto", fileDescriptor_2b3fc28395a6d9c5) } var fileDescriptor_2b3fc28395a6d9c5 = []byte{ - // 750 bytes of a gzipped FileDescriptorProto + // 747 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4d, 0x4f, 0xdb, 0x4c, 0x10, 0xf6, 0xe6, 0x0b, 0x98, 0xf0, 0x82, 0xdf, 0x05, 0xde, 0x37, 0x8d, 0xa8, 0x89, 0xac, 0x0a, 0xa5, 0x1c, 0x92, 0x2a, 0x54, 0x2a, 0xaa, 0x50, 0xa5, 0x94, 0x98, 0x12, 0x95, 0x3a, 0xe0, 0x38, @@ -523,7 +523,7 @@ var fileDescriptor_2b3fc28395a6d9c5 = []byte{ 0xaf, 0x04, 0xee, 0xe6, 0x4a, 0x40, 0x9f, 0x6d, 0x01, 0x7d, 0xb7, 0x05, 0xf4, 0xc3, 0x16, 0xd0, 0x85, 0x2d, 0xa0, 0x5f, 0xb6, 0x80, 0x7e, 0xdb, 0x02, 0x77, 0x63, 0x0b, 0xe8, 0xeb, 0xb5, 0xc0, 0x5d, 0x5c, 0x0b, 0xdc, 0xe5, 0xb5, 0xc0, 0x1d, 0x05, 0x5f, 0x97, 0x7a, 0xcc, 0x7d, 0x18, 0x36, - 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xee, 0xbe, 0x64, 0x48, 0x84, 0x06, 0x00, 0x00, + 0xff, 0x0c, 0x00, 0xee, 0xbe, 0x64, 0x48, 0x84, 0x06, 0x00, 0x00, } func (x FrontendToSchedulerType) String() string { diff --git a/pkg/storage/bucket/azure/config_test.go b/pkg/storage/bucket/azure/config_test.go index 8051198c67a..c0ffb1364dd 100644 --- a/pkg/storage/bucket/azure/config_test.go +++ b/pkg/storage/bucket/azure/config_test.go @@ -13,18 +13,16 @@ import ( // defaultConfig should match the default flag values defined in RegisterFlagsWithPrefix. var defaultConfig = Config{ - Endpoint: "blob.core.windows.net", - MaxRetries: 20, - Config: http.Config{ - IdleConnTimeout: 90 * time.Second, - ResponseHeaderTimeout: 2 * time.Minute, - InsecureSkipVerify: false, - TLSHandshakeTimeout: 10 * time.Second, - ExpectContinueTimeout: 1 * time.Second, - MaxIdleConns: 100, - MaxIdleConnsPerHost: 100, - MaxConnsPerHost: 0, - }, + Endpoint: "blob.core.windows.net", + MaxRetries: 20, + IdleConnTimeout: 90 * time.Second, + ResponseHeaderTimeout: 2 * time.Minute, + InsecureSkipVerify: false, + TLSHandshakeTimeout: 10 * time.Second, + ExpectContinueTimeout: 1 * time.Second, + MaxIdleConns: 100, + MaxIdleConnsPerHost: 100, + MaxConnsPerHost: 0, } func TestConfig(t *testing.T) { diff --git a/pkg/storage/tsdb/bucketindex/index.go b/pkg/storage/tsdb/bucketindex/index.go index 75a5ba3f4be..fdcd118d377 100644 --- a/pkg/storage/tsdb/bucketindex/index.go +++ b/pkg/storage/tsdb/bucketindex/index.go @@ -8,7 +8,6 @@ import ( "time" "github.com/oklog/ulid/v2" - "github.com/prometheus/prometheus/tsdb" "github.com/thanos-io/thanos/pkg/block" "github.com/thanos-io/thanos/pkg/block/metadata" @@ -137,12 +136,10 @@ func (m *Block) GetUploadedAt() time.Time { // of it. func (m *Block) ThanosMeta(userID string) *metadata.Meta { return &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - ULID: m.ID, - MinTime: m.MinTime, - MaxTime: m.MaxTime, - Version: metadata.TSDBVersion1, - }, + ULID: m.ID, + MinTime: m.MinTime, + MaxTime: m.MaxTime, + Version: metadata.TSDBVersion1, Thanos: metadata.Thanos{ Version: metadata.ThanosVersion1, Labels: map[string]string{ diff --git a/pkg/storage/tsdb/bucketindex/index_test.go b/pkg/storage/tsdb/bucketindex/index_test.go index facec55416d..2162a991c7c 100644 --- a/pkg/storage/tsdb/bucketindex/index_test.go +++ b/pkg/storage/tsdb/bucketindex/index_test.go @@ -305,12 +305,10 @@ func TestBlock_ThanosMeta(t *testing.T) { SegmentsNum: 3, }, expected: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - ULID: blockID, - MinTime: 10, - MaxTime: 20, - Version: metadata.TSDBVersion1, - }, + ULID: blockID, + MinTime: 10, + MaxTime: 20, + Version: metadata.TSDBVersion1, Thanos: metadata.Thanos{ Version: metadata.ThanosVersion1, Labels: map[string]string{ @@ -333,12 +331,10 @@ func TestBlock_ThanosMeta(t *testing.T) { SegmentsNum: 0, }, expected: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - ULID: blockID, - MinTime: 10, - MaxTime: 20, - Version: metadata.TSDBVersion1, - }, + ULID: blockID, + MinTime: 10, + MaxTime: 20, + Version: metadata.TSDBVersion1, Thanos: metadata.Thanos{ Version: metadata.ThanosVersion1, Labels: map[string]string{ @@ -358,12 +354,10 @@ func TestBlock_ThanosMeta(t *testing.T) { ChunkMaxSize: 500, }, expected: &metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - ULID: blockID, - MinTime: 10, - MaxTime: 20, - Version: metadata.TSDBVersion1, - }, + ULID: blockID, + MinTime: 10, + MaxTime: 20, + Version: metadata.TSDBVersion1, Thanos: metadata.Thanos{ Version: metadata.ThanosVersion1, Labels: map[string]string{ diff --git a/pkg/storage/tsdb/caching_bucket_test.go b/pkg/storage/tsdb/caching_bucket_test.go index 4dcfbcc52d2..614b3bf7016 100644 --- a/pkg/storage/tsdb/caching_bucket_test.go +++ b/pkg/storage/tsdb/caching_bucket_test.go @@ -206,10 +206,8 @@ func Test_BucketIndexCache(t *testing.T) { wrappedBucket := &countingBucket{Bucket: inmem} metadataCfg := MetadataCacheConfig{ - BucketCacheBackend: BucketCacheBackend{ - Backend: CacheBackendInMemory, - InMemory: InMemoryBucketCacheConfig{MaxSizeBytes: 1024 * 1024}, - }, + Backend: CacheBackendInMemory, + InMemory: InMemoryBucketCacheConfig{MaxSizeBytes: 1024 * 1024}, BucketIndexContentTTL: tc.ttl, BucketIndexMaxSize: 1024 * 1024, } @@ -263,10 +261,8 @@ func Test_BucketIndexCacheForCompactor(t *testing.T) { wrappedBucket := &countingBucket{Bucket: inmem} metadataCfg := MetadataCacheConfig{ - BucketCacheBackend: BucketCacheBackend{ - Backend: CacheBackendInMemory, - InMemory: InMemoryBucketCacheConfig{MaxSizeBytes: 1024 * 1024}, - }, + Backend: CacheBackendInMemory, + InMemory: InMemoryBucketCacheConfig{MaxSizeBytes: 1024 * 1024}, BucketIndexContentTTL: tc.ttl, BucketIndexMaxSize: 1024 * 1024, } diff --git a/pkg/storage/tsdb/expanded_postings_cache_test.go b/pkg/storage/tsdb/expanded_postings_cache_test.go index 4f4f0741a0a..c97868ae6dc 100644 --- a/pkg/storage/tsdb/expanded_postings_cache_test.go +++ b/pkg/storage/tsdb/expanded_postings_cache_test.go @@ -80,8 +80,8 @@ func Test_ShouldFetchPromiseOnlyOnce(t *testing.T) { } func TestFifoCacheDisabled(t *testing.T) { - cfg := PostingsCacheConfig{} - cfg.Enabled = false + cfg := PostingsCacheConfig{ + Enabled: false} m := NewPostingCacheMetrics(prometheus.NewPedanticRegistry()) timeNow := time.Now cache := newLruCache[int](cfg, "test", m, timeNow) diff --git a/pkg/storage/tsdb/lazy_matchers_test.go b/pkg/storage/tsdb/lazy_matchers_test.go index 95bf966a1dd..ce5fbe1c3d3 100644 --- a/pkg/storage/tsdb/lazy_matchers_test.go +++ b/pkg/storage/tsdb/lazy_matchers_test.go @@ -157,12 +157,10 @@ func TestFetchWithLazyMatchers(t *testing.T) { // Build an in-memory head with known series ir := &mockIndexReaderWithSeries{ - mockIndexReader: mockIndexReader{ - labelValues: map[string][]string{ - "__name__": {"cpu"}, - "pod": {"web-1", "web-2", "worker-1", "worker-2", "api-1"}, - "service": {"frontend", "backend"}, - }, + labelValues: map[string][]string{ + "__name__": {"cpu"}, + "pod": {"web-1", "web-2", "worker-1", "worker-2", "api-1"}, + "service": {"frontend", "backend"}, }, series: map[storage.SeriesRef]labels.Labels{ 1: labels.FromStrings("__name__", "cpu", "pod", "web-1", "service", "frontend"), @@ -199,10 +197,8 @@ func TestFetchWithLazyMatchers_FiltersCorrectly(t *testing.T) { ctx := context.Background() ir := &mockIndexReaderWithSeries{ - mockIndexReader: mockIndexReader{ - labelValues: map[string][]string{ - "pod": {"web-1", "worker-1", "web-2"}, - }, + labelValues: map[string][]string{ + "pod": {"web-1", "worker-1", "web-2"}, }, series: map[storage.SeriesRef]labels.Labels{ 1: labels.FromStrings("pod", "web-1"), @@ -281,12 +277,10 @@ func TestFetchWithLazyMatchers_SkipsGCdSeries(t *testing.T) { ctx := context.Background() ir := &mockIndexReaderWithError{ - mockIndexReaderWithSeries: mockIndexReaderWithSeries{ - mockIndexReader: mockIndexReader{}, - series: map[storage.SeriesRef]labels.Labels{ - 1: labels.FromStrings("__name__", "cpu", "pod", "web-0"), - 3: labels.FromStrings("__name__", "cpu", "pod", "web-1"), - }, + mockIndexReader: mockIndexReader{}, + series: map[storage.SeriesRef]labels.Labels{ + 1: labels.FromStrings("__name__", "cpu", "pod", "web-0"), + 3: labels.FromStrings("__name__", "cpu", "pod", "web-1"), }, errOnRef: 2, err: storage.ErrNotFound, @@ -311,16 +305,12 @@ func TestFetchWithLazyMatchers_PropagatesSeriesError(t *testing.T) { injectedErr := errors.New("injected disk error") ir := &mockIndexReaderWithError{ - mockIndexReaderWithSeries: mockIndexReaderWithSeries{ - mockIndexReader: mockIndexReader{ - labelValues: map[string][]string{"pod": {"web-0", "web-1", "db-0"}}, - postingsCounts: map[string]int{"__name__\xffcpu": 3}, - }, - series: map[storage.SeriesRef]labels.Labels{ - 1: labels.FromStrings("__name__", "cpu", "pod", "web-0"), - 2: labels.FromStrings("__name__", "cpu", "pod", "db-0"), - 3: labels.FromStrings("__name__", "cpu", "pod", "web-1"), - }, + labelValues: map[string][]string{"pod": {"web-0", "web-1", "db-0"}}, + postingsCounts: map[string]int{"__name__\xffcpu": 3}, + series: map[storage.SeriesRef]labels.Labels{ + 1: labels.FromStrings("__name__", "cpu", "pod", "web-0"), + 2: labels.FromStrings("__name__", "cpu", "pod", "db-0"), + 3: labels.FromStrings("__name__", "cpu", "pod", "web-1"), }, errOnRef: 2, err: injectedErr, diff --git a/pkg/storegateway/bucket_stores_test.go b/pkg/storegateway/bucket_stores_test.go index 4bf3e7af065..8f5e92e1beb 100644 --- a/pkg/storegateway/bucket_stores_test.go +++ b/pkg/storegateway/bucket_stores_test.go @@ -937,8 +937,8 @@ func TestBucketStores_tokenBuckets(t *testing.T) { generateStorageBlock(t, storageDir, userID, metricName, 10, 100, 15) } - sharding := userShardingStrategy{} - sharding.users = []string{user1, user2} + sharding := userShardingStrategy{ + users: []string{user1, user2}} bucket, err := filesystem.NewBucketClient(filesystem.Config{Directory: storageDir}) assert.NoError(t, err) diff --git a/pkg/storegateway/sharding_strategy_test.go b/pkg/storegateway/sharding_strategy_test.go index 744d9e751bd..eb5f3dff949 100644 --- a/pkg/storegateway/sharding_strategy_test.go +++ b/pkg/storegateway/sharding_strategy_test.go @@ -12,7 +12,6 @@ import ( "github.com/oklog/ulid/v2" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -274,7 +273,7 @@ func TestDefaultShardingStrategy(t *testing.T) { for instanceAddr, expectedBlocks := range testData.expectedBlocks { filter := NewDefaultShardingStrategy(r, instanceAddr, log.NewNopLogger(), nil) for _, block := range expectedBlocks { - owned, err := filter.OwnBlock("user-1", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block}}) + owned, err := filter.OwnBlock("user-1", metadata.Meta{ULID: block}) require.NoError(t, err) require.True(t, owned) } @@ -661,7 +660,7 @@ func TestShuffleShardingStrategy(t *testing.T) { for _, expected := range testData.expectedBlocks { filter := NewShuffleShardingStrategy(r, expected.instanceID, expected.instanceAddr, testData.limits, log.NewNopLogger(), allowedTenants, zoneStableShuffleSharding) //nolint:govet for _, block := range expected.blocks { - owned, err := filter.OwnBlock(userID, metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block}}) + owned, err := filter.OwnBlock(userID, metadata.Meta{ULID: block}) require.NoError(t, err) require.True(t, owned) } @@ -738,16 +737,16 @@ func TestDefaultShardingStrategy_OwnBlock(t *testing.T) { // Wait until the ring client has synced. require.NoError(t, ring.WaitInstanceState(ctx, r, "instance-1", ring.ACTIVE)) filter := NewDefaultShardingStrategy(r, "127.0.0.1", log.NewNopLogger(), nil) - owned, err := filter.OwnBlock("", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block1}}) + owned, err := filter.OwnBlock("", metadata.Meta{ULID: block1}) require.NoError(t, err) require.True(t, owned) // Owned by 127.0.0.2 - owned, err = filter.OwnBlock("", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block2}}) + owned, err = filter.OwnBlock("", metadata.Meta{ULID: block2}) require.NoError(t, err) require.False(t, owned) filter2 := NewDefaultShardingStrategy(r, "127.0.0.2", log.NewNopLogger(), nil) - owned, err = filter2.OwnBlock("", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block2}}) + owned, err = filter2.OwnBlock("", metadata.Meta{ULID: block2}) require.NoError(t, err) require.True(t, owned) } @@ -792,15 +791,15 @@ func TestShuffleShardingStrategy_OwnBlock(t *testing.T) { filter := NewShuffleShardingStrategy(r, "instance-1", "127.0.0.1", limits, log.NewNopLogger(), nil, true) filter2 := NewShuffleShardingStrategy(r, "instance-2", "127.0.0.2", limits, log.NewNopLogger(), nil, true) - owned, err := filter.OwnBlock("user-1", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block1}}) + owned, err := filter.OwnBlock("user-1", metadata.Meta{ULID: block1}) require.NoError(t, err) require.True(t, owned) // Owned by 127.0.0.2 - owned, err = filter.OwnBlock("user-1", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block2}}) + owned, err = filter.OwnBlock("user-1", metadata.Meta{ULID: block2}) require.NoError(t, err) require.False(t, owned) - owned, err = filter2.OwnBlock("user-1", metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block2}}) + owned, err = filter2.OwnBlock("user-1", metadata.Meta{ULID: block2}) require.NoError(t, err) require.True(t, owned) } @@ -809,7 +808,7 @@ func TestShardingBlockLifecycleCallbackAdapter(t *testing.T) { userID := "user-1" logger := log.NewNopLogger() block := ulid.MustNew(1, nil) - meta := metadata.Meta{BlockMeta: tsdb.BlockMeta{ULID: block}} + meta := metadata.Meta{ULID: block} for _, tc := range []struct { name string diff --git a/pkg/storegateway/storegatewaypb/gateway.pb.go b/pkg/storegateway/storegatewaypb/gateway.pb.go index fa5913faf44..7b058a1a88c 100644 --- a/pkg/storegateway/storegatewaypb/gateway.pb.go +++ b/pkg/storegateway/storegatewaypb/gateway.pb.go @@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("gateway.proto", fileDescriptor_f1a937782ebbded5) } var fileDescriptor_f1a937782ebbded5 = []byte{ - // 257 bytes of a gzipped FileDescriptorProto + // 254 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0x4f, 0x2c, 0x49, 0x2d, 0x4f, 0xac, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0x72, 0x0b, 0x92, 0xa4, 0xcc, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x4b, 0x32, 0x12, 0xf3, @@ -44,8 +44,7 @@ var fileDescriptor_f1a937782ebbded5 = []byte{ 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf8, 0xc0, 0x21, 0x04, 0x0f, 0xd7, 0x24, 0x36, - 0x70, 0x28, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xec, 0xe6, 0x0a, 0x7a, 0x01, 0x00, - 0x00, + 0x70, 0x28, 0x19, 0x03, 0x06, 0x00, 0x1b, 0xec, 0xe6, 0x0a, 0x7a, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/util/grpcclient/instrumentation.go b/pkg/util/grpcclient/instrumentation.go index a4e6cad731f..09cadf60a10 100644 --- a/pkg/util/grpcclient/instrumentation.go +++ b/pkg/util/grpcclient/instrumentation.go @@ -13,30 +13,30 @@ import ( func Instrument(requestDuration *prometheus.HistogramVec) ([]grpc.UnaryClientInterceptor, []grpc.StreamClientInterceptor) { return []grpc.UnaryClientInterceptor{ - grpcutil.HTTPHeaderPropagationClientInterceptor, - otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()), - middleware.ClientUserHeaderInterceptor, - cortexmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration), - }, []grpc.StreamClientInterceptor{ - grpcutil.HTTPHeaderPropagationStreamClientInterceptor, - unwrapErrorStreamClientInterceptor(), - otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer()), - middleware.StreamClientUserHeaderInterceptor, - cortexmiddleware.PrometheusGRPCStreamInstrumentation(requestDuration), - } + grpcutil.HTTPHeaderPropagationClientInterceptor, + otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()), + middleware.ClientUserHeaderInterceptor, + cortexmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration), + }, []grpc.StreamClientInterceptor{ + grpcutil.HTTPHeaderPropagationStreamClientInterceptor, + unwrapErrorStreamClientInterceptor(), + otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer()), + middleware.StreamClientUserHeaderInterceptor, + cortexmiddleware.PrometheusGRPCStreamInstrumentation(requestDuration), + } } func InstrumentReusableStream(requestDuration *prometheus.HistogramVec) ([]grpc.UnaryClientInterceptor, []grpc.StreamClientInterceptor) { return []grpc.UnaryClientInterceptor{ - grpcutil.HTTPHeaderPropagationClientInterceptor, - otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()), - middleware.ClientUserHeaderInterceptor, - cortexmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration), - }, []grpc.StreamClientInterceptor{ - grpcutil.HTTPHeaderPropagationStreamClientInterceptor, - unwrapErrorStreamClientInterceptor(), - otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer()), - middleware.StreamClientUserHeaderInterceptor, - cortexmiddleware.PrometheusGRPCReusableStreamInstrumentation(requestDuration), - } + grpcutil.HTTPHeaderPropagationClientInterceptor, + otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()), + middleware.ClientUserHeaderInterceptor, + cortexmiddleware.PrometheusGRPCUnaryInstrumentation(requestDuration), + }, []grpc.StreamClientInterceptor{ + grpcutil.HTTPHeaderPropagationStreamClientInterceptor, + unwrapErrorStreamClientInterceptor(), + otgrpc.OpenTracingStreamClientInterceptor(opentracing.GlobalTracer()), + middleware.StreamClientUserHeaderInterceptor, + cortexmiddleware.PrometheusGRPCReusableStreamInstrumentation(requestDuration), + } } diff --git a/pkg/util/http_test.go b/pkg/util/http_test.go index d2a5e128d4f..b45e0a8f0bd 100644 --- a/pkg/util/http_test.go +++ b/pkg/util/http_test.go @@ -142,21 +142,19 @@ func TestStreamWriteYAMLResponse(t *testing.T) { func TestParseProtoReader(t *testing.T) { // 47 bytes compressed and 53 uncompressed req := &cortexpb.PreallocWriteRequest{ - WriteRequest: cortexpb.WriteRequest{ - Timeseries: []cortexpb.PreallocTimeseries{ - { - TimeSeries: &cortexpb.TimeSeries{ - Labels: []cortexpb.LabelAdapter{ - {Name: "foo", Value: "bar"}, - }, - Samples: []cortexpb.Sample{ - {Value: 10, TimestampMs: 1}, - {Value: 20, TimestampMs: 2}, - {Value: 30, TimestampMs: 3}, - }, - Exemplars: []cortexpb.Exemplar{}, - Histograms: []cortexpb.WrappedHistogram{}, + Timeseries: []cortexpb.PreallocTimeseries{ + { + TimeSeries: &cortexpb.TimeSeries{ + Labels: []cortexpb.LabelAdapter{ + {Name: "foo", Value: "bar"}, }, + Samples: []cortexpb.Sample{ + {Value: 10, TimestampMs: 1}, + {Value: 20, TimestampMs: 2}, + {Value: 30, TimestampMs: 3}, + }, + Exemplars: []cortexpb.Exemplar{}, + Histograms: []cortexpb.WrappedHistogram{}, }, }, }, diff --git a/pkg/util/metrics_helper.go b/pkg/util/metrics_helper.go index 9cc9f01ed38..1a961223410 100644 --- a/pkg/util/metrics_helper.go +++ b/pkg/util/metrics_helper.go @@ -673,20 +673,18 @@ func (d *HistogramData) Metric(desc *prometheus.Desc, labelValues ...string) pro // Construct histogram in-place within the struct (no intermediate copy) return &nativeHistogramMetric{ - desc: desc, - Histogram: dto.Histogram{ - Schema: &schema, - ZeroThreshold: &zt, - SampleCount: &sc, - SampleSum: &ss, - ZeroCount: &zc, - PositiveSpan: posSpans, - PositiveDelta: posDeltas, - NegativeSpan: negSpans, - NegativeDelta: negDeltas, - Bucket: buckets, - }, - labelPairs: prometheus.MakeLabelPairs(desc, labelValues), + desc: desc, + Schema: &schema, + ZeroThreshold: &zt, + SampleCount: &sc, + SampleSum: &ss, + ZeroCount: &zc, + PositiveSpan: posSpans, + PositiveDelta: posDeltas, + NegativeSpan: negSpans, + NegativeDelta: negDeltas, + Bucket: buckets, + labelPairs: prometheus.MakeLabelPairs(desc, labelValues), } } return prometheus.MustNewConstHistogram(desc, d.sampleCount, d.sampleSum, d.buckets, labelValues...) diff --git a/pkg/util/push/appender_test.go b/pkg/util/push/appender_test.go index e47ee7eebbe..293f81fbf31 100644 --- a/pkg/util/push/appender_test.go +++ b/pkg/util/push/appender_test.go @@ -7,7 +7,6 @@ import ( "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/histogram" "github.com/prometheus/prometheus/model/labels" - "github.com/prometheus/prometheus/model/metadata" "github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite" "github.com/stretchr/testify/assert" @@ -19,7 +18,7 @@ func TestCollectingAppender_AppendSample_SingleSeries(t *testing.T) { ls := labels.FromStrings("__name__", "cpu_usage", "job", "test") meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeGauge, Help: "CPU usage", Unit: "percent"}, + Type: model.MetricTypeGauge, Help: "CPU usage", Unit: "percent", MetricFamilyName: "cpu_usage", } @@ -48,7 +47,7 @@ func TestCollectingAppender_AppendSample_MultipleSamplesSameSeries(t *testing.T) ls := labels.FromStrings("__name__", "requests_total") meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeCounter}, + Type: model.MetricTypeCounter, MetricFamilyName: "requests_total", } @@ -69,7 +68,7 @@ func TestCollectingAppender_AppendSample_MultipleSamplesSameSeries(t *testing.T) func TestCollectingAppender_AppendSample_MultipleSeries(t *testing.T) { c := newCollectingAppender() meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeGauge}, + Type: model.MetricTypeGauge, MetricFamilyName: "metric", } @@ -99,7 +98,7 @@ func TestCollectingAppender_AppendSample_WithExemplars(t *testing.T) { c := newCollectingAppender() ls := labels.FromStrings("__name__", "latency") meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeHistogram}, + Type: model.MetricTypeHistogram, MetricFamilyName: "latency", } exemplars := []exemplar.Exemplar{ @@ -121,7 +120,7 @@ func TestCollectingAppender_AppendHistogram(t *testing.T) { c := newCollectingAppender() ls := labels.FromStrings("__name__", "request_duration_seconds") meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeHistogram, Help: "Request latency", Unit: "seconds"}, + Type: model.MetricTypeHistogram, Help: "Request latency", Unit: "seconds", MetricFamilyName: "request_duration_seconds", } @@ -171,7 +170,7 @@ func TestCollectingAppender_Metadata_EmptyMetricFamilyNameIgnored(t *testing.T) c := newCollectingAppender() ls := labels.FromStrings("__name__", "y") meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeGauge}, + Type: model.MetricTypeGauge, MetricFamilyName: "", } @@ -185,7 +184,7 @@ func TestCollectingAppender_Metadata_EmptyMetricFamilyNameIgnored(t *testing.T) func TestCollectingAppender_Metadata_DeduplicatedByFamilyName(t *testing.T) { c := newCollectingAppender() meta := prometheusremotewrite.Metadata{ - Metadata: metadata.Metadata{Type: model.MetricTypeCounter, Help: "help", Unit: "bytes"}, + Type: model.MetricTypeCounter, Help: "help", Unit: "bytes", MetricFamilyName: "http_requests_total", } @@ -206,7 +205,7 @@ func TestCollectingAppender_TimeSeries_EmptyInitially(t *testing.T) { func TestCollectingAppender_MixedSamplesAndHistograms(t *testing.T) { c := newCollectingAppender() ls := labels.FromStrings("__name__", "mixed") - meta := prometheusremotewrite.Metadata{MetricFamilyName: "mixed", Metadata: metadata.Metadata{Type: model.MetricTypeGauge}} + meta := prometheusremotewrite.Metadata{MetricFamilyName: "mixed", Type: model.MetricTypeGauge} require.NoError(t, c.AppendSample(ls, meta, 0, 1000, 1.0, nil)) diff --git a/pkg/util/push/otlp_test.go b/pkg/util/push/otlp_test.go index 8cd86fd37a8..68bd7fbead8 100644 --- a/pkg/util/push/otlp_test.go +++ b/pkg/util/push/otlp_test.go @@ -95,8 +95,8 @@ func TestOTLP_EnableTypeAndUnitLabels(t *testing.T) { test.otlpSeries.CopyTo(sm.Metrics().AppendEmpty()) - limits := validation.Limits{} - limits.EnableTypeAndUnitLabels = test.enableTypeAndUnitLabels + limits := validation.Limits{ + EnableTypeAndUnitLabels: test.enableTypeAndUnitLabels} overrides := validation.NewOverrides(limits, nil) promSeries, metadata, err := convertToPromTS(ctx, metrics, cfg, overrides, "user-1", logger) require.NoError(t, err) diff --git a/pkg/util/push/push_test.go b/pkg/util/push/push_test.go index 4cbdfe7fcec..f3d587b8c39 100644 --- a/pkg/util/push/push_test.go +++ b/pkg/util/push/push_test.go @@ -84,10 +84,8 @@ func makeV2ReqWithSeriesAndSymbols(seriesNum, symbolCount int) *cortexpb.Preallo } return &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: ts, - }, + Symbols: symbols, + Timeseries: ts, } } @@ -114,10 +112,8 @@ func makeV2ReqWithSeries(num int) *cortexpb.PreallocWriteRequestV2 { } return &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: ts, - }, + Symbols: symbols, + Timeseries: ts, } } @@ -311,16 +307,14 @@ func Test_convertV2RequestToV1_WithEnableTypeAndUnitLabels(t *testing.T) { { desc: "should attach unit and type labels when the enableTypeAndUnitLabels is true", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Samples: samples, - Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, - Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, - }, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Samples: samples, + Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, + Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, }, }, }, @@ -357,16 +351,14 @@ func Test_convertV2RequestToV1_WithEnableTypeAndUnitLabels(t *testing.T) { { desc: "should be added from metadata when __type__ and __unit__ labels already exist.", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4, 18, 19, 20, 21}, - Samples: samples, - Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, - Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, - }, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4, 18, 19, 20, 21}, + Samples: samples, + Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, + Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, }, }, }, @@ -403,16 +395,14 @@ func Test_convertV2RequestToV1_WithEnableTypeAndUnitLabels(t *testing.T) { { desc: "should not attach unit and type labels when the enableTypeAndUnitLabels is false", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Samples: samples, - Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, - Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, - }, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Samples: samples, + Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_COUNTER, HelpRef: 15, UnitRef: 16}, + Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, }, }, }, @@ -449,16 +439,14 @@ func Test_convertV2RequestToV1_WithEnableTypeAndUnitLabels(t *testing.T) { { desc: "should not attach when type is unknown and unit is empty although the enableTypeAndUnitLabels is true", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Samples: samples, - Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_UNSPECIFIED, HelpRef: 15, UnitRef: 0}, - Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, - }, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Samples: samples, + Metadata: cortexpb.MetadataV2{Type: cortexpb.METRIC_TYPE_UNSPECIFIED, HelpRef: 15, UnitRef: 0}, + Exemplars: []cortexpb.ExemplarV2{{LabelsRefs: []uint32{11, 12}, Value: 1, Timestamp: 1}}, }, }, }, @@ -587,10 +575,8 @@ func Test_convertV2RequestToV1_MetadataDedup(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { v2Req := cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: test.timeseries, - }, + Symbols: symbols, + Timeseries: test.timeseries, } v1Req, err := convertV2RequestToV1(&v2Req, false, false) @@ -680,19 +666,17 @@ func Test_convertV2RequestToV1_InvalidSymbolRefs(t *testing.T) { { name: "invalid UnitRef out of bounds", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Metadata: cortexpb.MetadataV2{ - Type: cortexpb.METRIC_TYPE_COUNTER, - UnitRef: 1983, - HelpRef: 0, - }, - Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Metadata: cortexpb.MetadataV2{ + Type: cortexpb.METRIC_TYPE_COUNTER, + UnitRef: 1983, + HelpRef: 0, }, + Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, }, }, }, @@ -702,19 +686,17 @@ func Test_convertV2RequestToV1_InvalidSymbolRefs(t *testing.T) { { name: "invalid HelpRef out of bounds in metadata conversion", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Metadata: cortexpb.MetadataV2{ - Type: cortexpb.METRIC_TYPE_GAUGE, - UnitRef: 0, - HelpRef: 9999, - }, - Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Metadata: cortexpb.MetadataV2{ + Type: cortexpb.METRIC_TYPE_GAUGE, + UnitRef: 0, + HelpRef: 9999, }, + Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, }, }, }, @@ -724,19 +706,17 @@ func Test_convertV2RequestToV1_InvalidSymbolRefs(t *testing.T) { { name: "valid symbol refs should not error", v2Req: &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: symbols, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2, 3, 4}, - Metadata: cortexpb.MetadataV2{ - Type: cortexpb.METRIC_TYPE_COUNTER, - UnitRef: 3, - HelpRef: 4, - }, - Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, + Symbols: symbols, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2, 3, 4}, + Metadata: cortexpb.MetadataV2{ + Type: cortexpb.METRIC_TYPE_COUNTER, + UnitRef: 3, + HelpRef: 4, }, + Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1}}, }, }, }, @@ -1463,21 +1443,19 @@ func Test_convertV2RequestToV1_DeepCopy(t *testing.T) { ph := cortexpb.WrapHistogram(cortexpb.FloatHistogramToHistogramProto(4, fh)) v2Req := &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: []string{"", "__name__", "test_metric"}, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2}, - Samples: []cortexpb.Sample{ - {Value: 1.0, TimestampMs: 1000}, - }, - Exemplars: []cortexpb.ExemplarV2{ - {LabelsRefs: []uint32{1, 2}, Value: 2.0, Timestamp: 1000}, - }, - Histograms: []cortexpb.WrappedHistogram{ - ph, - }, + Symbols: []string{"", "__name__", "test_metric"}, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2}, + Samples: []cortexpb.Sample{ + {Value: 1.0, TimestampMs: 1000}, + }, + Exemplars: []cortexpb.ExemplarV2{ + {LabelsRefs: []uint32{1, 2}, Value: 2.0, Timestamp: 1000}, + }, + Histograms: []cortexpb.WrappedHistogram{ + ph, }, }, }, @@ -1503,18 +1481,16 @@ func Test_convertV2RequestToV1_DeepCopy(t *testing.T) { func Test_convertV2RequestToV1_PreservesStartTimestamp(t *testing.T) { v2Req := &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: []string{"", "__name__", "test_metric"}, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2}, - Samples: []cortexpb.Sample{ - {Value: 1, TimestampMs: 1000, StartTimestampMs: 100}, - }, - Histograms: []cortexpb.WrappedHistogram{ - {Histogram: cortexpb.Histogram{TimestampMs: 2000, StartTimestampMs: 200}}, - }, + Symbols: []string{"", "__name__", "test_metric"}, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2}, + Samples: []cortexpb.Sample{ + {Value: 1, TimestampMs: 1000, StartTimestampMs: 100}, + }, + Histograms: []cortexpb.WrappedHistogram{ + {TimestampMs: 2000, StartTimestampMs: 200}, }, }, }, @@ -1542,16 +1518,14 @@ func Test_convertV2RequestToV1_PreservesStartTimestamp(t *testing.T) { func Test_convertV2RequestToV1_UsesCreatedTimestampAsFallback(t *testing.T) { v2Req := &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: []string{"", "__name__", "test_metric"}, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2}, - CreatedTimestamp: 777, - Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1000}}, - Histograms: []cortexpb.WrappedHistogram{{Histogram: cortexpb.Histogram{TimestampMs: 2000}}}, - }, + Symbols: []string{"", "__name__", "test_metric"}, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2}, + CreatedTimestamp: 777, + Samples: []cortexpb.Sample{{Value: 1, TimestampMs: 1000}}, + Histograms: []cortexpb.WrappedHistogram{{TimestampMs: 2000}}, }, }, }, @@ -1578,19 +1552,17 @@ func Test_convertV2RequestToV1_UsesCreatedTimestampAsFallback(t *testing.T) { func Test_convertV2RequestToV1_ExplicitStartTimestampTakesPrecedence(t *testing.T) { v2Req := &cortexpb.PreallocWriteRequestV2{ - WriteRequestV2: cortexpb.WriteRequestV2{ - Symbols: []string{"", "__name__", "test_metric"}, - Timeseries: []cortexpb.PreallocTimeseriesV2{ - { - TimeSeriesV2: &cortexpb.TimeSeriesV2{ - LabelsRefs: []uint32{1, 2}, - CreatedTimestamp: 777, - Samples: []cortexpb.Sample{ - {Value: 1, TimestampMs: 1000, StartTimestampMs: 100}, - }, - Histograms: []cortexpb.WrappedHistogram{ - {Histogram: cortexpb.Histogram{TimestampMs: 2000, StartTimestampMs: 200}}, - }, + Symbols: []string{"", "__name__", "test_metric"}, + Timeseries: []cortexpb.PreallocTimeseriesV2{ + { + TimeSeriesV2: &cortexpb.TimeSeriesV2{ + LabelsRefs: []uint32{1, 2}, + CreatedTimestamp: 777, + Samples: []cortexpb.Sample{ + {Value: 1, TimestampMs: 1000, StartTimestampMs: 100}, + }, + Histograms: []cortexpb.WrappedHistogram{ + {TimestampMs: 2000, StartTimestampMs: 200}, }, }, }, diff --git a/pkg/util/validation/active_series_tracker_test.go b/pkg/util/validation/active_series_tracker_test.go index 818b51a62d8..65959a0ddef 100644 --- a/pkg/util/validation/active_series_tracker_test.go +++ b/pkg/util/validation/active_series_tracker_test.go @@ -69,10 +69,10 @@ func TestActiveSeriesTrackersConfig_Validate(t *testing.T) { } func TestOverrides_ActiveSeriesTrackers_PerTenant(t *testing.T) { - defaults := Limits{} - defaults.ActiveSeriesTrackers = ActiveSeriesTrackersConfig{ - {Name: "default_tracker", Matchers: `{__name__=~".*"}`}, - } + defaults := Limits{ + ActiveSeriesTrackers: ActiveSeriesTrackersConfig{ + {Name: "default_tracker", Matchers: `{__name__=~".*"}`}, + }} require.NoError(t, defaults.ActiveSeriesTrackers.Validate()) SetDefaultLimitsForYAMLUnmarshalling(defaults) diff --git a/tools/thanosconvert/thanosconvert_test.go b/tools/thanosconvert/thanosconvert_test.go index f1c611cb456..0dcab28677c 100644 --- a/tools/thanosconvert/thanosconvert_test.go +++ b/tools/thanosconvert/thanosconvert_test.go @@ -12,7 +12,6 @@ import ( "github.com/go-kit/log" "github.com/oklog/ulid/v2" "github.com/pkg/errors" - "github.com/prometheus/prometheus/tsdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/thanos-io/thanos/pkg/block/metadata" @@ -187,9 +186,7 @@ func TestThanosBlockConverter(t *testing.T) { func cortexMeta(user string) metadata.Meta { return metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - Version: metadata.ThanosVersion1, - }, + Version: metadata.ThanosVersion1, Thanos: metadata.Thanos{ Labels: map[string]string{ cortex_tsdb.TenantIDExternalLabel: user, @@ -200,9 +197,7 @@ func cortexMeta(user string) metadata.Meta { func thanosMeta() metadata.Meta { return metadata.Meta{ - BlockMeta: tsdb.BlockMeta{ - Version: metadata.ThanosVersion1, - }, + Version: metadata.ThanosVersion1, Thanos: metadata.Thanos{ Labels: map[string]string{ "cluster": "foo",