svn commit: r793999 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java src/java/org/apache/hadoop/hbase/client/HConnectionManager.java src/java/org/apache/hadoop/hbase/client/ServerConnectionManager.java

[stack]

Author: stack
Date: Tue Jul 14 18:08:56 2009
New Revision: 793999

URL: http://svn.apache.org/viewvc?rev=793999&view=rev
Log:
HBASE-1651 client is broken, it requests ROOT region location from ZK too much

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=793999&r1=793998&r2=793999&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jul 14 18:08:56 2009
@@ -260,6 +260,8 @@
    HBASE-1646  Scan-s can't set a Filter (Doğacan Güney via Stack)
    HBASE-1649  ValueFilter may not reset its internal state
                (Doğacan Güney via Stack)
+   HBASE-1651 client is broken, it requests ROOT region location from ZK too
+              much
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=793999&r1=793998&r2=793999&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java 
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java 
Tue Jul 14 18:08:56 2009
@@ -834,4 +834,4 @@
     copyOfConf.setInt("hbase.client.retries.number", 1);
     new HBaseAdmin(copyOfConf);
   }
-}
\ No newline at end of file
+}

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=793999&r1=793998&r2=793999&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Tue Jul 14 18:08:56 2009
@@ -65,6 +65,7 @@
  * Used by {...@link HTable} and {...@link HBaseAdmin}
  */
 public class HConnectionManager implements HConstants {
+  private static final Log LOG = LogFactory.getLog(HConnectionManager.class);
 
   /*
    * Not instantiable.
@@ -77,7 +78,7 @@
   // instance. Note that although the Map is synchronized, the objects it 
   // contains are mutable and hence require synchronized access to them
   private static 
-  final Map<HBaseConfiguration, TableServers> HBASE_INSTANCES = 
+  final Map<HBaseConfiguration, TableServers> HBASE_INSTANCES =
     new WeakHashMap<HBaseConfiguration, TableServers>();
   
   /**
@@ -93,6 +94,7 @@
       if (connection == null) {
         connection = new TableServers(conf);
         HBASE_INSTANCES.put(conf, connection);
+        LOG.debug("Created new HBASE_INSTANCES");
       }
     }
     return connection;
@@ -512,9 +514,9 @@
           // second waits. The second thread will not do find.
           
           if (!useCache || rootRegionLocation == null) {
-            return locateRootRegion();
+            this.rootRegionLocation = locateRootRegion();
           }
-          return rootRegionLocation;
+          return this.rootRegionLocation;
         }        
       } else if (Bytes.equals(tableName, META_TABLE_NAME)) {
         synchronized (metaRegionLock) {

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerConnectionManager.java?rev=793999&r1=793998&r2=793999&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerConnectionManager.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/ServerConnectionManager.java
 Tue Jul 14 18:08:56 2009
@@ -24,7 +24,7 @@
 
 /**
  * Used by server processes to expose HServerConnection method
- * setRootRegionLocation
+ * do can call {...@link HConnectionManager#setRootRegionLocation}
  */
 public class ServerConnectionManager extends HConnectionManager {
   /*
@@ -41,4 +41,4 @@
   public static ServerConnection getConnection(HBaseConfiguration conf) {
     return (ServerConnection) HConnectionManager.getConnection(conf);
   }
-}
+}
\ No newline at end of file