Repository: cassandra Updated Branches: refs/heads/trunk 6f647aaa0 -> add855ae1
Fix version check to enable streaming keep-alive Patch by Paulo Motta; Reviewed by Yuki Morishita for CASSANDRA-12929 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/add855ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/add855ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/add855ae Branch: refs/heads/trunk Commit: add855ae177d28d02f1172fb0070ef487237ead5 Parents: 6f647aa Author: Paulo Motta <pauloricard...@gmail.com> Authored: Thu Mar 30 19:41:02 2017 -0300 Committer: Paulo Motta <pa...@apache.org> Committed: Fri Mar 31 20:18:58 2017 -0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamSession.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/add855ae/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d4b53d0..f64e6a0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Fix version check to enable streaming keep-alive (CASSANDRA-12929) * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289) * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324) * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) http://git-wip-us.apache.org/repos/asf/cassandra/blob/add855ae/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 7ee99db..4f9d273 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -125,7 +125,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber /** * Version where keep-alive support was added */ - private static final CassandraVersion STREAM_KEEP_ALIVE = new CassandraVersion("3.10"); + private static final CassandraVersion STREAM_KEEP_ALIVE_VERSION = new CassandraVersion("3.10"); private static final Logger logger = LoggerFactory.getLogger(StreamSession.class); private static final DebuggableScheduledThreadPoolExecutor keepAliveExecutor = new DebuggableScheduledThreadPoolExecutor("StreamKeepAliveExecutor"); static { @@ -241,7 +241,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber private boolean isKeepAliveSupported() { CassandraVersion peerVersion = Gossiper.instance.getReleaseVersion(peer); - return STREAM_KEEP_ALIVE.isSupportedBy(peerVersion); + return peerVersion.compareTo(STREAM_KEEP_ALIVE_VERSION) >= 0; } /**
