Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1729D185E7 for ; Thu, 31 Dec 2015 19:01:44 +0000 (UTC) Received: (qmail 86708 invoked by uid 500); 31 Dec 2015 19:01:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 86628 invoked by uid 500); 31 Dec 2015 19:01:43 -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 86436 invoked by uid 99); 31 Dec 2015 19:01:43 -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; Thu, 31 Dec 2015 19:01:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9FCF0E1083; Thu, 31 Dec 2015 19:01:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 31 Dec 2015 19:01:44 -0000 Message-Id: <3e1156ccca4b4495bb86add9342ab25d@git.apache.org> In-Reply-To: <56b24fc2468e41f7aaafd7268b505f73@git.apache.org> References: <56b24fc2468e41f7aaafd7268b505f73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/10] cassandra git commit: Fix binding to any address in CqlBulkRecordWriter Fix binding to any address in CqlBulkRecordWriter patch by yukim; reviewed by snazy for CASSANDRA-9309 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a55fd76d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a55fd76d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a55fd76d Branch: refs/heads/cassandra-2.2 Commit: a55fd76ddd96e3ed2d967910f0572804fcfacc2f Parents: 0d51b65 Author: Yuki Morishita Authored: Wed Jul 8 16:29:36 2015 -0500 Committer: Yuki Morishita Committed: Thu Dec 31 12:40:57 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9997e1e..0bd5485 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.13 + * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309) * Fix the way we replace sstables after anticompaction (CASSANDRA-10831) * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875) * Log error when stream session fails (CASSANDRA-9294) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a55fd76d/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java index 66a0362..400fd35 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java @@ -131,10 +131,11 @@ public class OutboundTcpConnectionPool } else { - Socket socket = SocketChannel.open(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())).socket(); - if (Config.getOutboundBindAny() && !socket.isBound()) - socket.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0)); - return socket; + SocketChannel channel = SocketChannel.open(); + if (!Config.getOutboundBindAny()) + channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0)); + channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort())); + return channel.socket(); } }