fix: skip streams over limits in dry-run mode #17114
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkg/distributor/distributor.go
Outdated
| // TODO(grobinson): This will be removed, as we only want to fail the request | ||
| // when specific limits are exceeded. | ||
| return nil, httpgrpc.Error(http.StatusBadRequest, "request exceeded limits") | ||
| if _, ok := status.FromError(err); ok { |
There was a problem hiding this comment.
This tells us if it is an httpgrpc error or not.
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
from
b5073b2 to
f4ddd20
Compare
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
3 times, most recently
from
3e92b42 to
1a62b64
Compare
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
2 times, most recently
from
047978b to
cba8c04
Compare
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
from
cba8c04 to
a897f0d
Compare
periklis
approved these changes
Apr 14, 2025
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
from
f8b91ed to
df10a75
Compare
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
from
df10a75 to
3ebdc2f
Compare
periklis
reviewed
Apr 15, 2025
Comment on lines
+2831
to
+2832
| metadata := mockKafkaClient.recordsPerTopic[".metadata"] | ||
| require.Equal(t, test.expectedMetadataRecords, len(metadata)) |
There was a problem hiding this comment.
nit. Do we need to save the mock records in the mock producer for other tests? I guess a counter would be sufficient right?
periklis
approved these changes
Apr 15, 2025
grobinson-grafana
force-pushed
the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
from
f0d5942 to
894d03e
Compare
grobinson-grafana
deleted the
grobinson/skip-streams-over-limits-in-dry-run-mode
branch
grobinson-grafana
added a commit
that referenced
this pull request
Apr 15, 2025
chaudum
pushed a commit
that referenced
this pull request
Apr 15, 2025
Contains backports of these commits: ``` 2cde9b1 fix: skip streams over limits in dry-run mode (#17114) 805125c fix: fix a bug where limits were incorrect after #16937 (#17224) d106042 fix: fix bug where expectedStreamUsageRequest was not used (#17223) 69aeda1 feat: add tests for enforcing limits in distributors (#17124) ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This pull request fixes a bug when distributors were running with
IngestLimitsDryRunEnabledwhere streams that were over the max stream limits would still be written to the metadata topic, meaning those streams would be included in the existing streams rather than outside the max stream limit.This is stacked on top of #17124.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR