natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct the messaging versions used in ThirdHandshakeMessage. 

patch by jasobrown; reviewed by Ariel Weisberg for CASSANDRA-14896
This commit is contained in:
Jason Brown 2018-11-29 14:19:02 -08:00
parent c277fc56b5
commit f3609995c0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/cassandra/net/async/HandshakeProtocol.java
View File

@ -214,6 +214,7 @@ public class HandshakeProtocol
* The third message of the handshake, sent by the connection initiator on reception of {@link SecondHandshakeMessage}.
* This message contains:
* 1) the connection initiator's messaging version (4 bytes) - {@link org.apache.cassandra.net.MessagingService#current_version}.
* This indicates the max messaging version supported by this node.
* 2) the connection initiator's broadcast address as encoded by {@link org.apache.cassandra.net.CompactEndpointSerializationHelper}.
* This can be either 5 bytes for an IPv4 address, or 17 bytes for an IPv6 one.
* <p>
@ -230,6 +231,9 @@ public class HandshakeProtocol
*/
private static final int MIN_LENGTH = 9;
/**
* The internode messaging version of the peer; used for serializing to a version the peer understands.
*/
final int messagingVersion;
final InetAddressAndPort address;
@ -245,7 +249,9 @@ public class HandshakeProtocol
int bufLength = Ints.checkedCast(Integer.BYTES + CompactEndpointSerializationHelper.instance.serializedSize(address, messagingVersion));
ByteBuf buffer = allocator.directBuffer(bufLength, bufLength);
buffer.writerIndex(0);
buffer.writeInt(messagingVersion);
// the max messaging version supported by the local node (not #messagingVersion)
buffer.writeInt(MessagingService.current_version);
try
{
DataOutputPlus dop = new ByteBufDataOutputPlus(buffer);

2
src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java
View File

@ -177,7 +177,7 @@ public class OutboundHandshakeHandler extends ByteToMessageDecoder
try
{
ctx.writeAndFlush(new ThirdHandshakeMessage(MessagingService.current_version, connectionId.local()).encode(ctx.alloc()));
ctx.writeAndFlush(new ThirdHandshakeMessage(peerMessagingVersion, connectionId.local()).encode(ctx.alloc()));
ChannelWriter channelWriter = setupPipeline(ctx.channel(), peerMessagingVersion);
callback.accept(HandshakeResult.success(channelWriter, peerMessagingVersion));
}