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

duricanikolic · 2024-03-17T12:38:35Z

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.

integration/ingester_test.go

integration/querier_test.go

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

pkg/distributor/distributor_test.go

pkg/distributor/query_ingest_storage_test.go

pkg/ingester/client/chunkcompat.go

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

charleskorn

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

* Get rid of querier.prefer-streaming-chunks-from-ingesters Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing a failing test Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing failing tests Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Make lint happy Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> (cherry picked from commit 8ed42e1)

…7661) * Get rid of querier.prefer-streaming-chunks-from-ingesters Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing a failing test Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing failing tests Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Make lint happy Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> (cherry picked from commit 8ed42e1) Co-authored-by: Đurica Yuri Nikolić <durica.nikolic@grafana.com>

…7662) * Get rid of querier.prefer-streaming-chunks-from-ingesters Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing a failing test Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing failing tests Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Make lint happy Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> (cherry picked from commit 8ed42e1) Co-authored-by: Đurica Yuri Nikolić <durica.nikolic@grafana.com>

@grafanabot

* Move -querier.minimize-ingester-requests from experimental to advanced (#7649) Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * 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 <durica.nikolic@grafana.com> * Fixing a failing test Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing failing tests Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Make lint happy Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> * Fixing review findings Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> (cherry picked from commit 8ed42e1) Co-authored-by: Đurica Yuri Nikolić <durica.nikolic@grafana.com> * [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 <durica.nikolic@grafana.com> --------- Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com> Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com> Co-authored-by: Felix Beuke <felix.j.beuke@gmail.com>

pstibrany · 2024-04-24T09:48:35Z

This PR is missing CHANGELOG entry.

duricanikolic self-assigned this Mar 17, 2024

charleskorn reviewed Mar 18, 2024

View reviewed changes

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 added 4 commits March 18, 2024 16:51

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

8cf1e28

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

Fixing a failing test

0fca835

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

Fixing review findings

561a1a7

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

Fixing failing tests

30e30f4

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

duricanikolic force-pushed the yuri/deprecated-feature-1 branch 2 times, most recently from 1459119 to 740629a Compare March 18, 2024 16:27

Make lint happy

9805602

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

duricanikolic force-pushed the yuri/deprecated-feature-1 branch from 740629a to 9805602 Compare March 18, 2024 16:32

charleskorn reviewed Mar 18, 2024

View reviewed changes

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 changed the title ~~Get rid of querier.prefer-streaming-chunks-from-ingesters~~ Get rid of -querier.prefer-streaming-chunks-from-ingesters Mar 19, 2024

Fixing review findings

010339b

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>

duricanikolic requested a review from charleskorn March 19, 2024 06:50

duricanikolic marked this pull request as ready for review March 19, 2024 08:39

duricanikolic requested review from jdbaldry and a team as code owners March 19, 2024 08:39

charleskorn approved these changes Mar 19, 2024

View reviewed changes

duricanikolic merged commit 8ed42e1 into main Mar 19, 2024
29 checks passed

duricanikolic deleted the yuri/deprecated-feature-1 branch March 19, 2024 11:55

duricanikolic added the backport release-2.12 label Mar 19, 2024

grafanabot mentioned this pull request Mar 19, 2024

[release-2.12] Get rid of -querier.prefer-streaming-chunks-from-ingesters #7661

Merged

duricanikolic added the backport r282 label Mar 19, 2024

grafanabot mentioned this pull request Mar 19, 2024

[r282] Get rid of -querier.prefer-streaming-chunks-from-ingesters #7662

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

duricanikolic commented Mar 17, 2024 •

edited

Loading

charleskorn left a comment

pstibrany commented Apr 24, 2024

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

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

Conversation

duricanikolic commented Mar 17, 2024 • edited Loading

What this PR does

Which issue(s) this PR fixes or relates to

Checklist

charleskorn left a comment

Choose a reason for hiding this comment

pstibrany commented Apr 24, 2024

duricanikolic commented Mar 17, 2024 •

edited

Loading