Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c718bfff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c718bfff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c718bfff Branch: refs/heads/trunk Commit: c718bfff9a27e23ec1b31fcb81f3b65d134936d1 Parents: aea8bbf 3f89d24 Author: Jason Brown <[email protected]> Authored: Fri Feb 17 13:38:17 2017 -0800 Committer: Jason Brown <[email protected]> Committed: Fri Feb 17 13:39:05 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/net/OutboundTcpConnection.java | 22 ++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c718bfff/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c718bfff/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 69480df,a0ed270..feff527 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@@ -439,10 -438,10 +439,8 @@@ public class OutboundTcpConnection exte int maxTargetVersion = handshakeVersion(in); if (maxTargetVersion == NO_VERSION) { - // no version is returned, so disconnect an try again: we will either get - // a different target version (targetVersion < MessagingService.VERSION_12) - // or if the same version the handshake will finally succeed + // no version is returned, so disconnect an try again logger.trace("Target max version is {}; no version information yet, will retry", maxTargetVersion); - if (DatabaseDescriptor.getSeeds().contains(poolReference.endPoint())) - logger.warn("Seed gossip version is {}; will not connect with that version", maxTargetVersion); disconnect(); continue; }
