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 for query_rejection bug #6145

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

erlan-z
Copy link
Contributor

@erlan-z erlan-z commented Aug 8, 2024

What this PR does:
Fix for bug in query rejection

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

Checklist

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

Signed-off-by: Erlan Zholdubai uulu <[email protected]>
@erlan-z erlan-z force-pushed the query-rejection-bug-fix branch from 032106f to 71da81f Compare August 8, 2024 21:27
Copy link
Contributor

@danielblando danielblando left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

Thanks

@@ -14,7 +14,7 @@ import (
"github.com/cortexproject/cortex/pkg/util/validation"
)

const QueryRejectErrorMessage = "This query has been rejected by the service operator."
const QueryRejectErrorMessage = "This query does not perform well and has been rejected by the service operator."
Copy link
Contributor

Choose a reason for hiding this comment

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

It is probably unnecessary for this one. But we do make the message a flag in Ingester in order to customize it. https://github.com/cortexproject/cortex/blob/master/pkg/ingester/ingester.go#L162

Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if we want to include the first part does not perform well. If a regex accidentally matches a good query, does it confuse users?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In that case, it gives good reason to user to reach out service operator asking why that query does not perform well. We want user to reach out to service team if query is rejected by accident so I think it's good idea to have this part of the error message in case of accidental match.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK. I think we can leave it for now.

@yeya24 yeya24 merged commit a046044 into cortexproject:master Aug 13, 2024
16 checks passed
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.

Query Rejection for Metadata Queries Bug
3 participants