Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8EB59200C42 for ; Fri, 17 Feb 2017 22:39:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8D626160B57; Fri, 17 Feb 2017 21:39:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CC4CA160B46 for ; Fri, 17 Feb 2017 22:39:48 +0100 (CET) Received: (qmail 25611 invoked by uid 500); 17 Feb 2017 21:39:46 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 25164 invoked by uid 99); 17 Feb 2017 21:39:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2017 21:39:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39323E0B24; Fri, 17 Feb 2017 21:39:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Fri, 17 Feb 2017 21:39:55 -0000 Message-Id: <8113a0946a574a2b913100291b47bf3b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk archived-at: Fri, 17 Feb 2017 21:39:49 -0000 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 Authored: Fri Feb 17 13:38:17 2017 -0800 Committer: Jason Brown 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; }