8000 [WIP] parquet-mimir rebased main d29961bf x theirs by francoposa · Pull Request #11421 · grafana/mimir · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[WIP] parquet-mimir rebased main d29961bf x theirs #11421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

francoposa
Copy link
Contributor

What this PR does

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

dimitarvdimitrov and others added 30 commits May 2, 2025 12:03
Changed error handling for LabelValues and LabelNames in `blocks_store_queryable.go` to distinguish retriable and non-retriable errors. This matches the logic for series calls

https://github.com/grafana/mimir/blob/0676ed782eb07d5383093b822683923cb33bdca9/pkg/querier/blocks_store_queryable.go#L781-L788

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Adding some observability on grpc connections: grafana/dskit#685
… runtime config is disabled (#11359)

* Fix tenant config mapping when runtime config service is disabled

* Fix comment location
* Add ingester HPA trigger targeting max owned series per pod

* Update CHANGELOG

* make format-jsonnet-manifests

* Update CHANGELOG.md

Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com>

---------

Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com>
* Upgrade to gRPC v1.71.1

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Charles Korn <charles.korn@grafana.com>
#11380)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…1378)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…1.79.3 (#11383)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…nants (#11309)

* Alertmanager: Make SMTP From configurable for Grafana Alertmanager tenants

* update and fix tests

* use default globals instead of empty globals

* trigger build

* make check-protos
…e/azblob to v1.6.1 (#11384)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…to v1.28 (#11386)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Porting #11388 and #11389 from r341

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
* update otel resource attribute promotion docs

* update docs based on feedback
Add a timing histogram for job completions.
* feature(queries): enable duration arithmetic
* Add changelog
* Enable engine upstream tests
* Add about-versioning.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
* ingest: Clarify we expect ordering between samples

based on 11286

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Change order in requests

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
this helps with flaky tests

related to XXX

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
…11396)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* querier: add support dynamic replication in consistency checks

the querier today retries only 3 times each block. This works ok with replication factor=3. But with dynamic replication it feels like we’re giving up too early. There might be other store-gateways that can serve the block, but we don’t even attempt them.

This PR changes the blockStoreQuerier to retry until the maximum replication factor. This doesn't add additional overhead for non-replicated blocks because `blocksStoreReplicationSet.GetClientsFor` would return an error after the third retry anyway and we'd short-circuit here

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Add CHANGELOG.md entry

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Use MaxReplicationFactor from DynamicReplication instead of BlocksConsistency(Tracker)

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Update CHANGELOG.md

Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com>

* Fix panic in test

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Fix tests in blocks_store_queryable_test.go

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com>
…lientWhenDone (#11397)

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
* querier: fix NopDynamicReplication.MaxReplicationFactor

follow-up of 11354

This method should be returning the full replication factor including the factors from the sharding ring and the dynamic replication config. Without that retries here will not work properly when dynamic replication is off

https://github.com/grafana/mimir/blob/1140f7c6191b08a3f9078f6e45af166a1cf57e77/pkg/querier/blocks_store_queryable.go#L571
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Update CHANGELOG.md entry

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Fix TestShuffleShardingStrategy

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Fix TestBlocksStoreReplicationSet_GetClientsFor_ShouldSupportRandomLoadBalancingStrategy

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Fix TestBlocksStoreReplicationSet_GetClientsFor

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
pracucci and others added 16 commits May 7, 2025 08:46
…pportWriteBothToIngestersAndPartitions and TestDistributor_Push_ShouldSupportIngestStorage (#11399)

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Enrich alerts for invalid cluster validation labels with an additional
label: protocol.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Parquet converter

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Co-authored-by: Nico Pazos <nicolas.pazos-mendez@grafana.com>
Co-authored-by: Franco Posa <franco.posa@grafana.com>

* move readTsdb to parquet storage sub-package; rename method & vars for clarity & testability (#11222)

* move readTsdb to parquet storage sub-package; rename method & vars for clarity

* add license header

* Parquet: Initialize parquet converter module (#11226)

* Initialize parquet compactor module

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>

* Rename to parquet converter

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>

* Implement allowlist

* fix reader tests

* Update docs

* also skip disallowed tenants when converting blocks

* fix initialization of allowedTenants

* various name changes

---------

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Co-authored-by: Nicolás Pazos <npazosmendez@gmail.com>

---------

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Co-authored-by: Nico Pazos <nicolas.pazos-mendez@grafana.com>
Co-authored-by: Franco Posa <franco.posa@grafana.com>
Co-authored-by: Franco Posa <franco@francoposa.io>
Co-authored-by: Nicolás Pazos <npazosmendez@gmail.com>
* fix lints

* fix license header

* update parquet-converter intialization to match compactor; introduce extra metrics prefix for bucket index loader to avoid duplicate registration; tweak integration test ring metric values for parquet-converter presence

* clean up logger usages
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
* add in parquet-common files

* fix imports

* fix license headers

* fix error comparison lints

* fix lints

* fix go.mod

* fix parquet/convert/writer_test.go

* quarantine existing queryable in subpackage

* add in latest search constraint improvements
@francoposa francoposa changed the base branch from main to parquet-mimir May 7, 2025 17:45
Copy link
Contributor
github-actions bot commented May 7, 2025

💻 Deploy preview deleted.

@CLAassistant
Copy link
CLAassistant commented May 7, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
18 out of 19 committers have signed the CLA.

✅ julienduchesne
✅ dimitarvdimitrov
✅ pr00se
✅ tacole02
✅ aknuds1
✅ charleskorn
✅ jhalterman
✅ krajorama
✅ seizethedave
✅ colega
✅ alexweav
✅ alexander-akhmetov
✅ narqo
✅ npazosmendez
✅ francoposa
✅ jesusvazquez
✅ santihernandezc
✅ pracucci
❌ mimir-github-bot[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@francoposa francoposa marked this pull request as ready for review May 7, 2025 19:26
@francoposa francoposa requested review from a team, stevesg and tacole02 as code owners May 7, 2025 19:26
@francoposa francoposa merged commit edd1687 into parquet-mimir May 7, 2025
24 of 33 checks passed
@francoposa francoposa deleted the parquet-mimir-rebased-main-d29961bf-x-theirs branch May 7, 2025 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0