Skip to content
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

Get rid of -querier.prefer-streaming-chunks-from-ingesters #7639

Merged
merged 6 commits into from
Mar 19, 2024

Conversation

duricanikolic
Copy link
Contributor

@duricanikolic duricanikolic commented Mar 17, 2024

What this PR does

This PR is needed for the release of Mimir 2.12.

Experimental CLI flag -querier.prefer-streaming-chunks-from-ingesters has been enabled by default and marked for deletion in Mimir 2.12 in #6174.
This PR gets rid of this CLI flags.

As a consequence, distributor's configuration option distributor.Config. PreferStreamingChunksFromIngesters, that is currently always set to true, should also be removed.

Which issue(s) this PR fixes or relates to

Part of #7542

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.

@duricanikolic duricanikolic self-assigned this Mar 17, 2024
integration/ingester_test.go Outdated Show resolved Hide resolved
integration/ingester_test.go Show resolved Hide resolved
integration/querier_test.go Show resolved Hide resolved
@duricanikolic duricanikolic force-pushed the yuri/deprecated-feature-1 branch 2 times, most recently from 1459119 to 740629a Compare March 18, 2024 16:27
Signed-off-by: Yuri Nikolic <[email protected]>
pkg/distributor/distributor_test.go Outdated Show resolved Hide resolved
pkg/distributor/distributor_test.go Show resolved Hide resolved
pkg/distributor/query_ingest_storage_test.go Outdated Show resolved Hide resolved
pkg/ingester/client/chunkcompat.go Outdated Show resolved Hide resolved
@duricanikolic duricanikolic changed the title Get rid of querier.prefer-streaming-chunks-from-ingesters Get rid of -querier.prefer-streaming-chunks-from-ingesters Mar 19, 2024
Signed-off-by: Yuri Nikolic <[email protected]>
@duricanikolic duricanikolic marked this pull request as ready for review March 19, 2024 08:39
@duricanikolic duricanikolic requested review from jdbaldry and a team as code owners March 19, 2024 08:39
Copy link
Contributor

@charleskorn charleskorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, modulo question discussed offline about unique chunk count assertion removed from TestDistributor_QueryStream_ShouldSupportIngestStorage

@duricanikolic duricanikolic merged commit 8ed42e1 into main Mar 19, 2024
29 checks passed
@duricanikolic duricanikolic deleted the yuri/deprecated-feature-1 branch March 19, 2024 11:55
grafanabot pushed a commit that referenced this pull request Mar 19, 2024
* Get rid of querier.prefer-streaming-chunks-from-ingesters

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing a failing test

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing failing tests

Signed-off-by: Yuri Nikolic <[email protected]>

* Make lint happy

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
(cherry picked from commit 8ed42e1)
grafanabot pushed a commit that referenced this pull request Mar 19, 2024
* Get rid of querier.prefer-streaming-chunks-from-ingesters

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing a failing test

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing failing tests

Signed-off-by: Yuri Nikolic <[email protected]>

* Make lint happy

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
(cherry picked from commit 8ed42e1)
duricanikolic added a commit that referenced this pull request Mar 19, 2024
…7661)

* Get rid of querier.prefer-streaming-chunks-from-ingesters

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing a failing test

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing failing tests

Signed-off-by: Yuri Nikolic <[email protected]>

* Make lint happy

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
(cherry picked from commit 8ed42e1)

Co-authored-by: Đurica Yuri Nikolić <[email protected]>
duricanikolic added a commit that referenced this pull request Mar 19, 2024
…7662)

* Get rid of querier.prefer-streaming-chunks-from-ingesters

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing a failing test

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing failing tests

Signed-off-by: Yuri Nikolic <[email protected]>

* Make lint happy

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
(cherry picked from commit 8ed42e1)

Co-authored-by: Đurica Yuri Nikolić <[email protected]>
duricanikolic added a commit that referenced this pull request Mar 20, 2024
* Move -querier.minimize-ingester-requests from experimental to advanced (#7649)

Signed-off-by: Yuri Nikolic <[email protected]>

* Get rid of -querier.prefer-streaming-chunks-from-ingesters (#7639) (#7661)

* Get rid of querier.prefer-streaming-chunks-from-ingesters

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing a failing test

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing failing tests

Signed-off-by: Yuri Nikolic <[email protected]>

* Make lint happy

Signed-off-by: Yuri Nikolic <[email protected]>

* Fixing review findings

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
(cherry picked from commit 8ed42e1)

Co-authored-by: Đurica Yuri Nikolić <[email protected]>

* [query-frontend] Close response body in request handler (#7654) (#7663)

* [query-frontend] Close response body in request handler (#7654)

* [query-frontend] close response body in request handler

(cherry picked from commit eaef377)

* changelog

* Update VERSIOn for release 2.12.0-rc.1 (#7671)

Signed-off-by: Yuri Nikolic <[email protected]>

---------

Signed-off-by: Yuri Nikolic <[email protected]>
Co-authored-by: Grot (@grafanabot) <[email protected]>
Co-authored-by: Felix Beuke <[email protected]>
@pstibrany
Copy link
Member

This PR is missing CHANGELOG entry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants