Update cortex to bring v11 schema #1201
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
Signed-off-by: Cyril Tovena <[email protected]>
Signed-off-by: Cyril Tovena <[email protected]>
Signed-off-by: Cyril Tovena <[email protected]>
joe-elliott
approved these changes
Oct 28, 2019
| @@ -37,7 +38,7 @@ func (d *Distributor) PushHandler(w http.ResponseWriter, r *http.Request) { | |||
| } | |||
|
|
|||
| default: | |||
| if _, err := util.ParseProtoReader(r.Context(), r.Body, &req, util.RawSnappy); err != nil { | |||
| if _, err := util.ParseProtoReader(r.Context(), r.Body, int(r.ContentLength), math.MaxInt32, &req, util.RawSnappy); err != nil { | |||
There was a problem hiding this comment.
ParseProtoReader uses max size to create a LimitedReader. It feels strange to pass math.MaxInt32 in here, but reviewing the code it seems like it would be fine:
https://github.com/golang/go/blob/master/src/io/io.go#L444
There was a problem hiding this comment.
Nothing more to add here, but I'd echo @joe-elliott's comments.
There was a problem hiding this comment.
I'm not sure what to use for this value, but it seems that the limit reader is used only for another CompressionType (not RawSnappy).
There was a problem hiding this comment.
RawSnappy doesn't use a LimitedReader.
owen-d
approved these changes
Oct 28, 2019
gouthamve
approved these changes
Oct 29, 2019
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.
For now we still keep v10 as default. This will enable us to test the new schema.