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

fix remote read error in query frontend #5257

Merged
merged 3 commits into from Apr 11, 2023

Conversation

yeya24
Copy link
Collaborator

@yeya24 yeya24 commented Apr 11, 2023

What this PR does:

Fix the remote read bug in query frontend.
The bug is that r.ParseForm doesn't handle the remote read protobuf type request body correctly.

Which issue(s) this PR fixes:
Fixes #5253

Checklist

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

Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24 yeya24 force-pushed the fix-remote-read branch 2 times, most recently from 94629bf to a8d13f3 Compare April 11, 2023 05:49
Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24 yeya24 force-pushed the fix-remote-read branch 2 times, most recently from 7f77723 to ffa6e26 Compare April 11, 2023 17:05
@alanprot
Copy link
Member

thx

Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24
Copy link
Collaborator Author

yeya24 commented Apr 11, 2023

Will merge on green and I will release next RC.

@yeya24 yeya24 merged commit 8531f72 into cortexproject:master Apr 11, 2023
14 checks passed
@yeya24 yeya24 deleted the fix-remote-read branch April 11, 2023 17:29
yeya24 added a commit to yeya24/cortex that referenced this pull request Apr 11, 2023
* fix remote read error in query frontend

Signed-off-by: Ben Ye <benye@amazon.com>

* fix integration test

Signed-off-by: Ben Ye <benye@amazon.com>

* add extra one query

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
yeya24 added a commit that referenced this pull request Apr 11, 2023
* fix remote read error in query frontend (#5257)

* fix remote read error in query frontend

Signed-off-by: Ben Ye <benye@amazon.com>

* fix integration test

Signed-off-by: Ben Ye <benye@amazon.com>

* add extra one query

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* bump RC version

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
friedrichg added a commit that referenced this pull request Apr 23, 2023
* prepare 1.15.0-rc release (#5235)

Signed-off-by: Ben Ye <benye@amazon.com>

* Cherry-pick fixes to release 1.15 branch (#5241)

* Batch Iterator optimization (#5237)

* Batch Opmization

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Add test bacj

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Testing Multiples scrape intervals

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* no assimption

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Using max chunk ts

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* test with scrape 10

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* rename method

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* comments

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* using next

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* change test name

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* changelog/comments

Signed-off-by: Alan Protasio <alanprot@gmail.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* Store Gateway: Convert metrics from summary to histograms (#5239)

* Convert following metrics from summary to histogram

cortex_bucket_store_series_blocks_queried
cortex_bucket_store_series_data_fetched
cortex_bucket_store_series_data_size_touched_bytes
cortex_bucket_store_series_data_size_fetched_bytes
cortex_bucket_store_series_data_touched
cortex_bucket_store_series_result_series

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update changelog

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* fix changelog

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

* Catch context error in the s3 bucket client (#5240)

Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* bump RC version

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Co-authored-by: Alan Protasio <approtas@amazon.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>
Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com>

* Cherry-pick fixes to release 1.15 for new RC (#5259)

* fix remote read error in query frontend (#5257)

* fix remote read error in query frontend

Signed-off-by: Ben Ye <benye@amazon.com>

* fix integration test

Signed-off-by: Ben Ye <benye@amazon.com>

* add extra one query

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* bump RC version

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* Fix splitByInterval incorrect error response format (#5260) (#5261)

* fix query frontend incorrect error response format



* update changelog



* fix integration test



---------

Signed-off-by: Ben Ye <benye@amazon.com>

* release 1.15.0 (#5274)

Signed-off-by: Ben Ye <benye@amazon.com>

* merge 1.15 into master and resolve changelog conflicts

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Co-authored-by: Alan Protasio <approtas@amazon.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>
Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com>
yeya24 added a commit to yeya24/cortex that referenced this pull request Apr 28, 2023
* fix remote read error in query frontend

Signed-off-by: Ben Ye <benye@amazon.com>

* fix integration test

Signed-off-by: Ben Ye <benye@amazon.com>

* add extra one query

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
yeya24 added a commit to yeya24/cortex that referenced this pull request Apr 28, 2023
* prepare 1.15.0-rc release (cortexproject#5235)

Signed-off-by: Ben Ye <benye@amazon.com>

* Cherry-pick fixes to release 1.15 branch (cortexproject#5241)

* Batch Iterator optimization (cortexproject#5237)

* Batch Opmization

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Add test bacj

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Testing Multiples scrape intervals

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* no assimption

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* Using max chunk ts

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* test with scrape 10

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* rename method

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* comments

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* using next

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* change test name

Signed-off-by: Alan Protasio <alanprot@gmail.com>

* changelog/comments

Signed-off-by: Alan Protasio <alanprot@gmail.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* Store Gateway: Convert metrics from summary to histograms (cortexproject#5239)

* Convert following metrics from summary to histogram

cortex_bucket_store_series_blocks_queried
cortex_bucket_store_series_data_fetched
cortex_bucket_store_series_data_size_touched_bytes
cortex_bucket_store_series_data_size_fetched_bytes
cortex_bucket_store_series_data_touched
cortex_bucket_store_series_result_series

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update changelog

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* fix changelog

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog

Signed-off-by: Ben Ye <benye@amazon.com>

* Catch context error in the s3 bucket client (cortexproject#5240)

Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* bump RC version

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Co-authored-by: Alan Protasio <approtas@amazon.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>
Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com>

* Cherry-pick fixes to release 1.15 for new RC (cortexproject#5259)

* fix remote read error in query frontend (cortexproject#5257)

* fix remote read error in query frontend

Signed-off-by: Ben Ye <benye@amazon.com>

* fix integration test

Signed-off-by: Ben Ye <benye@amazon.com>

* add extra one query

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* bump RC version

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* Fix splitByInterval incorrect error response format (cortexproject#5260) (cortexproject#5261)

* fix query frontend incorrect error response format

* update changelog

* fix integration test

---------

Signed-off-by: Ben Ye <benye@amazon.com>

* release 1.15.0 (cortexproject#5274)

Signed-off-by: Ben Ye <benye@amazon.com>

* merge 1.15 into master and resolve changelog conflicts

Signed-off-by: Ben Ye <benye@amazon.com>

---------

Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Alan Protasio <alanprot@gmail.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
Co-authored-by: Alan Protasio <approtas@amazon.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>
Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remote read requests fail with "snappy: corrupt input" error
2 participants