hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1207297 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Date Mon, 28 Nov 2011 15:30:56 GMT
Author: tedyu
Date: Mon Nov 28 15:30:55 2011
New Revision: 1207297

URL: http://svn.apache.org/viewvc?rev=1207297&view=rev
Log:
HBASE-4773  HBaseAdmin may leak ZooKeeper connections (Xufeng)

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1207297&r1=1207296&r2=1207297&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Nov 28 15:30:55 2011
@@ -873,6 +873,7 @@ Release 0.90.5 - Unreleased
    HBASE-4848  TestScanner failing because hostname can't be null
    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/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1207297&r1=1207296&r2=1207297&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Mon Nov 28 15:30:55
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");
     }
   }



Mime
View raw message