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

Align the -server.http-write-timeout with -querier.timeout to 2m #3346

Merged
merged 7 commits into from
Nov 3, 2022

Conversation

hi-rustin
Copy link
Contributor

@hi-rustin hi-rustin commented Oct 31, 2022

What this PR does

Align the -server.http-write-timeout with -querier.timeout to 2m. Add validation for these values.

Which issue(s) this PR fixes or relates to

Fixes #3248

Checklist

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

@hi-rustin hi-rustin marked this pull request as ready for review October 31, 2022 15:18
@hi-rustin hi-rustin requested review from osg-grafana and a team as code owners October 31, 2022 15:18
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

Thanks for picking this up :) I think we can move it into a higher level package

pkg/querier/querier.go Outdated Show resolved Hide resolved
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

LGTM <3

I'll let others have a look before merging

Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! I left a couple of nits I'm going to auto apply.

CHANGELOG.md Outdated Show resolved Hide resolved
pkg/mimir/mimir.go Outdated Show resolved Hide resolved
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci enabled auto-merge (squash) November 3, 2022 09:08
@pracucci pracucci merged commit 5c6ca1f into grafana:main Nov 3, 2022
@hi-rustin hi-rustin deleted the rustin-patch-timeout branch November 3, 2022 10:02
masonmei pushed a commit to udmire/mimir that referenced this pull request Nov 4, 2022
…rafana#3346)

* Align the `-server.http-write-timeout` with `-querier.timeout` to 2m

* Add a validation for these values

* Update docs

* Update CHANGELOG.md

* move it into a higher level package

* Apply suggestions from code review

* Reordered CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
masonmei pushed a commit to udmire/mimir that referenced this pull request Nov 4, 2022
…rafana#3346)

* Align the `-server.http-write-timeout` with `-querier.timeout` to 2m

* Add a validation for these values

* Update docs

* Update CHANGELOG.md

* move it into a higher level package

* Apply suggestions from code review

* Reordered CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
colega added a commit that referenced this pull request Jan 2, 2023
This option now defaults to 2m:
#3346

And also it's validated to not to be lower than querier.timeout, so
having this 1m value breaks the jsonnet.

Fixes #3824

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
colega added a commit that referenced this pull request Jan 3, 2023
* Remove 'server.http-write-timeout' from jsonnet

This option now defaults to 2m:
#3346

And also it's validated to not to be lower than querier.timeout, so
having this 1m value breaks the jsonnet.

Fixes #3824

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* make check-jsonnet-tests

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Update CHANGELOG.md

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Remove helm-jsonnet ignore

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
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.

Queries timing out before querier.timeout is reached
3 participants