You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2018/11/28 23:25:40 UTC
cassandra git commit: Send correct messaging version in internode
messaging handshake's third message.
Repository: cassandra
Updated Branches:
refs/heads/trunk ff8906a6c -> c5dee08df
Send correct messaging version in internode messaging handshake's third message.
patch by jasobrown; reviewed by Ariel Weisberg for CASSANDRA-14896
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5dee08d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5dee08d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5dee08d
Branch: refs/heads/trunk
Commit: c5dee08dfb791ba28fecc8ca8b25a4a4d7e9cb07
Parents: ff8906a
Author: Jason Brown <ja...@netflix.com>
Authored: Wed Nov 28 14:50:15 2018 -0800
Committer: Jason Brown <ja...@netflix.com>
Committed: Wed Nov 28 15:23:29 2018 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/net/async/OutboundHandshakeHandler.java | 2 +-
.../apache/cassandra/net/async/OutboundHandshakeHandlerTest.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dee08d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e93649a..0f616c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Send correct messaging version in internode messaging handshake's third message (CASSANDRA-14896)
* Make Read and Write Latency columns consistent for proxyhistograms and tablehistograms (CASSANDRA-11939)
* Make protocol checksum type option case insensitive (CASSANDRA-14716)
* Forbid re-adding static columns as regular and vice versa (CASSANDRA-14913)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dee08d/src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java b/src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java
index 3ccbf49..c555bed 100644
--- a/src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java
+++ b/src/java/org/apache/cassandra/net/async/OutboundHandshakeHandler.java
@@ -177,7 +177,7 @@ public class OutboundHandshakeHandler extends ByteToMessageDecoder
try
{
- ctx.writeAndFlush(new ThirdHandshakeMessage(peerMessagingVersion, connectionId.local()).encode(ctx.alloc()));
+ ctx.writeAndFlush(new ThirdHandshakeMessage(MessagingService.current_version, connectionId.local()).encode(ctx.alloc()));
ChannelWriter channelWriter = setupPipeline(ctx.channel(), peerMessagingVersion);
callback.accept(HandshakeResult.success(channelWriter, peerMessagingVersion));
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dee08d/test/unit/org/apache/cassandra/net/async/OutboundHandshakeHandlerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/net/async/OutboundHandshakeHandlerTest.java b/test/unit/org/apache/cassandra/net/async/OutboundHandshakeHandlerTest.java
index 2d377af..172667c 100644
--- a/test/unit/org/apache/cassandra/net/async/OutboundHandshakeHandlerTest.java
+++ b/test/unit/org/apache/cassandra/net/async/OutboundHandshakeHandlerTest.java
@@ -181,7 +181,7 @@ public class OutboundHandshakeHandlerTest
try
{
ThirdHandshakeMessage thirdHandshakeMessage = ThirdHandshakeMessage.maybeDecode(thridMsgBuf);
- Assert.assertEquals(msgVersion, thirdHandshakeMessage.messagingVersion);
+ Assert.assertEquals(MESSAGING_VERSION, thirdHandshakeMessage.messagingVersion);
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org