Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 75575 invoked from network); 22 Sep 2010 06:38:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Sep 2010 06:38:27 -0000 Received: (qmail 55355 invoked by uid 500); 22 Sep 2010 06:38:27 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 55180 invoked by uid 500); 22 Sep 2010 06:38:26 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 54449 invoked by uid 99); 22 Sep 2010 06:38:25 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 06:38:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 22 Sep 2010 06:38:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A98E23889B3; Wed, 22 Sep 2010 06:37:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999777 - in /hadoop/zookeeper/branches/branch-3.3: CHANGES.txt src/java/main/org/apache/zookeeper/ClientCnxn.java Date: Wed, 22 Sep 2010 06:37:47 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100922063747.3A98E23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Wed Sep 22 06:37:46 2010 New Revision: 999777 URL: http://svn.apache.org/viewvc?rev=999777&view=rev Log: ZOOKEEPER-846. zookeeper client doesn't shut down cleanly on the close call Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=999777&r1=999776&r2=999777&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Wed Sep 22 06:37:46 2010 @@ -23,6 +23,9 @@ BUGFIXES: ZOOKEEPER-785. Zookeeper 3.3.1 shouldn't infinite loop if someone creates a server.0 line (part 2) (phunt) + ZOOKEEPER-846. zookeeper client doesn't shut down cleanly on the close call + (phunt) + IMPROVEMENTS: ZOOKEEPER-789. Improve FLE log messages (flavio via phunt) Modified: hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=999777&r1=999776&r2=999777&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java (original) +++ hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/ClientCnxn.java Wed Sep 22 06:37:46 2010 @@ -1259,8 +1259,6 @@ public class ClientCnxn { + Long.toHexString(getSessionId())); } - closing = true; - try { RequestHeader h = new RequestHeader(); h.setType(ZooDefs.OpCode.closeSession); @@ -1308,9 +1306,14 @@ public class ClientCnxn { packet.ctx = ctx; packet.clientPath = clientPath; packet.serverPath = serverPath; - if (!zooKeeper.state.isAlive()) { + if (!zooKeeper.state.isAlive() || closing) { conLossPacket(packet); } else { + // If the client is asking to close the session then + // mark as closing + if (h.getType() == OpCode.closeSession) { + closing = true; + } outgoingQueue.add(packet); } }