You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/12/30 16:22:07 UTC
svn commit: r1225845 - in /hbase/branches/0.90/src: main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java test/java/org/apache/hadoop/hbase/client/TestHCM.java

Author: tedyu
Date: Fri Dec 30 15:22:06 2011
New Revision: 1225845

URL: http://svn.apache.org/viewvc?rev=1225845&view=rev
Log:
HBASE-5102 Addendum that removes stale connection in HBaseAdmin ctor

Modified:
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
    hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1225845&r1=1225844&r2=1225845&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Dec 30 15:22:06 2011
@@ -99,10 +99,10 @@ public class HBaseAdmin implements Abort
         this.connection.getMaster();
         break;
       } catch (MasterNotRunningException mnre) {
-        HConnectionManager.deleteConnection(this.conf, false);
+        HConnectionManager.deleteStaleConnection(this.connection);
         this.connection = HConnectionManager.getConnection(this.conf);
       } catch (UndeclaredThrowableException ute) {
-        HConnectionManager.deleteConnection(this.conf, false);
+        HConnectionManager.deleteStaleConnection(this.connection);
         this.connection = HConnectionManager.getConnection(this.conf);
       }
       try { // Sleep
@@ -110,13 +110,13 @@ public class HBaseAdmin implements Abort
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
         // we should delete connection between client and zookeeper
-        HConnectionManager.deleteConnection(this.conf, false);
+        HConnectionManager.deleteStaleConnection(this.connection);
         throw new MasterNotRunningException("Interrupted");
       }
     }
     if (tries >= numRetries) {
       // we should delete connection between client and zookeeper
-      HConnectionManager.deleteConnection(this.conf, false);
+      HConnectionManager.deleteStaleConnection(this.connection);
       throw new MasterNotRunningException("Retried " + numRetries + " times");
     }
   }

Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1225845&r1=1225844&r2=1225845&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java Fri Dec 30 15:22:06 2011
@@ -109,8 +109,8 @@ public class TestHCM {
           + getHConnectionManagerCacheSize());
       Thread.sleep(100);
     }
-    Assert.assertEquals(startingHConnectionManagerCacheSize + 1,
-      getHConnectionManagerCacheSize());
+    int sz = getHConnectionManagerCacheSize();
+    Assert.assertTrue(sz <= startingHConnectionManagerCacheSize + 1);
   }
 
   private static int getHConnectionManagerCacheSize()