Fix Metadata and IndexMetadata XContent Parsing not Draining Parser #74844
Conversation
This file contains hidden or 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
Exactly the same as elastic#73268 but for metadata and index metadata which can run into the same bug.
original-brownbear
added
>non-issue
:Distributed Coordination/Snapshot/Restore
elasticmachine
added
the
Team:Distributed (Obsolete)
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
fcofdez
reviewed
Jul 1, 2021
| if (parser.currentToken() != XContentParser.Token.FIELD_NAME) { | ||
| throw new IllegalArgumentException("expected field name but got a " + parser.currentToken()); | ||
| } | ||
| XContentParserUtils.ensureExpectedToken(XContentParser.Token.FIELD_NAME, parser.currentToken(), parser); |
Contributor
There was a problem hiding this comment.
I guess it's fine to throw here a ParsingException instead of IllegalArgumentException?
Contributor
Author
There was a problem hiding this comment.
I think that's fine and maybe even preferable as it gives a much easier to interpret error message by including some bytes around the broken section in the message.
fcofdez
approved these changes
Jul 1, 2021
Contributor
fcofdez
left a comment
fcofdez
left a comment
There was a problem hiding this comment.
LGTM, I left a minor question. 👍
Contributor
Author
|
Thanks Francisco! |
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jul 13, 2021
…lastic#74844) Exactly the same as elastic#73268 but for metadata and index metadata which can run into the same bug.
original-brownbear
added a commit
to original-brownbear/elasticsearch
that referenced
this pull request
Jul 13, 2021
…lastic#74844) Exactly the same as elastic#73268 but for metadata and index metadata which can run into the same bug.
original-brownbear
added a commit
that referenced
this pull request
Jul 13, 2021
original-brownbear
added a commit
that referenced
this pull request
Jul 13, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Exactly the same as #73268 but for metadata and index metadata which can run into
the same bug.