hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r781468 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Date Wed, 03 Jun 2009 16:46:29 GMT
Author: jdcryans
Date: Wed Jun  3 16:46:28 2009
New Revision: 781468

URL: http://svn.apache.org/viewvc?rev=781468&view=rev
Log:
HBASE-1462  hclient still seems to depend on master

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=781468&r1=781467&r2=781468&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Jun  3 16:46:28 2009
@@ -304,6 +304,7 @@
                in master and regionserver UIs
    HBASE-1448  Add a node in ZK to tell all masters to shutdown
    HBASE-1478  Remove hbase master options from shell (Nitay Joffe via Stack)
+   HBASE-1462  hclient still seems to depend on master
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

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=781468&r1=781467&r2=781468&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 Wed
Jun  3 16:46:28 2009
@@ -328,7 +328,6 @@
     public HRegionLocation getRegionLocation(final byte [] name,
         final byte [] row, boolean reload)
     throws IOException {
-      getMaster();
       return reload? relocateRegion(name, row): locateRegion(name, row);
     }
 
@@ -476,14 +475,12 @@
     public HRegionLocation locateRegion(final byte [] tableName,
         final byte [] row)
     throws IOException{
-      getMaster();
       return locateRegion(tableName, row, true);
     }
 
     public HRegionLocation relocateRegion(final byte [] tableName,
         final byte [] row)
     throws IOException{
-      getMaster();
       return locateRegion(tableName, row, false);
     }
 
@@ -795,7 +792,7 @@
     public HRegionInterface getHRegionConnection(
         HServerAddress regionServer) 
     throws IOException {
-      return getHRegionConnection(regionServer, true);
+      return getHRegionConnection(regionServer, false);
     }
 
     public synchronized ZooKeeperWrapper getZooKeeperWrapper() throws IOException {
@@ -806,7 +803,7 @@
     }
 
     /*
-     * Repeatedly try to find the root region by asking the master for where it is
+     * Repeatedly try to find the root region in ZK
      * @return HRegionLocation for root region if found
      * @throws NoServerForRegionException - if the root region can not be
      * located after retrying
@@ -814,7 +811,6 @@
      */
     private HRegionLocation locateRootRegion()
     throws IOException {
-      getMaster();
 
       // We lazily instantiate the ZooKeeper object because we don't want to
       // make the constructor have to throw IOException or handle it itself.
@@ -901,7 +897,6 @@
 
     public <T> T getRegionServerWithRetries(ServerCallable<T> callable) 
     throws IOException, RuntimeException {
-      getMaster();
       List<Throwable> exceptions = new ArrayList<Throwable>();
       for(int tries = 0; tries < numRetries; tries++) {
         try {
@@ -934,7 +929,6 @@
     
     public <T> T getRegionServerForWithoutRetries(ServerCallable<T> callable)
         throws IOException, RuntimeException {
-      getMaster();
       try {
         callable.instantiateServer(false);
         return callable.call();
@@ -957,7 +951,6 @@
       boolean reload)
     throws IOException {
       boolean reloadFlag = reload;
-      getMaster();
       List<Throwable> exceptions = new ArrayList<Throwable>();
       HRegionLocation location = null;
       int tries = 0;



Mime
View raw message