Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-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 0A41492F4 for ; Mon, 23 Jan 2012 20:34:56 +0000 (UTC) Received: (qmail 82458 invoked by uid 500); 23 Jan 2012 20:34:55 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 82438 invoked by uid 500); 23 Jan 2012 20:34:55 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 82430 invoked by uid 99); 23 Jan 2012 20:34:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2012 20:34:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2012 20:34:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0847D238890D for ; Mon, 23 Jan 2012 20:34:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1234976 - in /zookeeper/branches/branch-3.3: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/Leader.java Date: Mon, 23 Jan 2012 20:34:31 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120123203432.0847D238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Mon Jan 23 20:34:31 2012 New Revision: 1234976 URL: http://svn.apache.org/viewvc?rev=1234976&view=rev Log: ZOOKEEPER-973. bind() could fail on Leader because it does not setReuseAddress on its ServerSocket (Harsh J via phunt) Modified: zookeeper/branches/branch-3.3/CHANGES.txt zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Modified: zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1234976&r1=1234975&r2=1234976&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ zookeeper/branches/branch-3.3/CHANGES.txt Mon Jan 23 20:34:31 2012 @@ -9,6 +9,8 @@ BUGFIXES: ZOOKEEPER-1345. Add a .gitignore file with general exclusions and Eclipse project files excluded (Harsh J via phunt) + ZOOKEEPER-973. bind() could fail on Leader because it does not + setReuseAddress on its ServerSocket (Harsh J via phunt) Release 3.3.4 - 2011-11-16 Backward compatible changes: Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1234976&r1=1234975&r2=1234976&view=diff ============================================================================== --- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original) +++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Mon Jan 23 20:34:31 2012 @@ -21,6 +21,7 @@ package org.apache.zookeeper.server.quor import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.BindException; +import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketAddress; @@ -128,7 +129,9 @@ public class Leader { Leader(QuorumPeer self,LeaderZooKeeperServer zk) throws IOException { this.self = self; try { - ss = new ServerSocket(self.getQuorumAddress().getPort()); + ss = new ServerSocket(); + ss.setReuseAddress(true); + ss.bind(new InetSocketAddress(self.getQuorumAddress().getPort())); } catch (BindException e) { LOG.error("Couldn't bind to port " + self.getQuorumAddress().getPort(), e);