Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 B336396A5 for ; Mon, 28 Nov 2011 17:07:46 +0000 (UTC) Received: (qmail 40297 invoked by uid 500); 28 Nov 2011 17:07:46 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 40264 invoked by uid 500); 28 Nov 2011 17:07:46 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 40257 invoked by uid 99); 28 Nov 2011 17:07:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Nov 2011 17:07:46 +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, 28 Nov 2011 17:07:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7E15F238897A for ; Mon, 28 Nov 2011 17:07:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1207458 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Date: Mon, 28 Nov 2011 17:07:23 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111128170723.7E15F238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Mon Nov 28 17:07:22 2011 New Revision: 1207458 URL: http://svn.apache.org/viewvc?rev=1207458&view=rev Log: HBASE-4773 HBaseAdmin may leak ZooKeeper connections (Xufeng) Modified: hbase/branches/0.92/CHANGES.txt hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Modified: hbase/branches/0.92/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1207458&r1=1207457&r2=1207458&view=diff ============================================================================== --- hbase/branches/0.92/CHANGES.txt (original) +++ hbase/branches/0.92/CHANGES.txt Mon Nov 28 17:07:22 2011 @@ -888,6 +888,7 @@ Release 0.90.5 - Unreleased HBase behaviour (Roman Shaposhnik) HBASE-4862 Splitting hlog and opening region concurrently may cause data loss (Chunhui Shen) + HBASE-4773 HBaseAdmin may leak ZooKeeper connections (Xufeng) IMPROVEMENT HBASE-4205 Enhance HTable javadoc (Eric Charles) Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1207458&r1=1207457&r2=1207458&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Mon Nov 28 17:07:22 2011 @@ -116,10 +116,14 @@ public class HBaseAdmin implements Abort Thread.sleep(getPauseTime(tries)); } catch (InterruptedException e) { Thread.currentThread().interrupt(); + // we should delete connection between client and zookeeper + HConnectionManager.deleteStaleConnection(this.connection); throw new MasterNotRunningException("Interrupted"); } } if (tries >= numRetries) { + // we should delete connection between client and zookeeper + HConnectionManager.deleteStaleConnection(this.connection); throw new MasterNotRunningException("Retried " + numRetries + " times"); } }