Netty4SizeHeaderFrameDecoder error #31057
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
martijnvg
added
>bug
review
:Distributed/Network
|
Pinging @elastic/es-core-infra |
martijnvg
commented
Jun 4, 2018
| final ByteBuf message = in.skipBytes(HEADER_SIZE); | ||
| // 6 bytes would mean it is a ping. And we should ignore. | ||
| if (messageLength != 6) { | ||
| if (messageWithHeaderLength != 6) { |
There was a problem hiding this comment.
I think it is clearer if we just let TcpTransport.readMessageLength() return -1 in case of a ping (right now it returns 0, but TcpTransport.PING_DATA_SIZE itself is -1)
…...) in Netty4SizeHeaderFrameDecoder.
martijnvg
force-pushed
the
Netty4SizeHeaderFrameDecoder
branch
from
f20a2a2
to
e14a1cb
Compare
jasontedor
requested changes
Jun 4, 2018
| @@ -37,17 +37,17 @@ | |||
| protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { | |||
| try { | |||
| BytesReference networkBytes = Netty4Utils.toBytesReference(in); | |||
| int messageLength = TcpTransport.readMessageLength(networkBytes) + HEADER_SIZE; | |||
| int messageLength = TcpTransport.readMessageLength(networkBytes); | |||
| int messageWithHeaderLength = messageLength + HEADER_SIZE; | |||
There was a problem hiding this comment.
I do not even think we should be making calculations with messageLength if it is equal to -1 so we should guard all of this in if (messageLength != -1).
jasontedor
reviewed
Jun 4, 2018
| int messageLength = TcpTransport.readMessageLength(networkBytes); | ||
| // If the message length is -1, we have not read a complete header. | ||
| if (messageLength != -1) { | ||
| int messageWithHeaderLength = messageLength + HEADER_SIZE; |
There was a problem hiding this comment.
Probably messageLengthWithHeader.
jasontedor
approved these changes
Jun 4, 2018
|
retest this please |
1 similar comment
|
retest this please |
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.
Always take into account return value of TcpTransport.readMessageLength(...) in Netty4SizeHeaderFrameDecoder.
If TcpTransport.readMessageLength(...) returned -1 then this was ignored because
HEADER_SIZEwas always added to what this method returns.During ccr benchmarking we have ran into the following error:
I'm not 100% sure whether that is caused by the fact the return value -1 was ignored, but after running the ccr benchmark many times with this change, I have not run into this error any more.