svn commit: r1357756 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

[la...@apache.org]

Author: larsh
Date: Thu Jul  5 17:35:24 2012
New Revision: 1357756

URL: http://svn.apache.org/viewvc?rev=1357756&view=rev
Log:
HBASE-6326 Avoid nested retry loops in HConnectionManager

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1357756&r1=1357755&r2=1357756&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Jul  5 17:35:24 2012
@@ -900,18 +900,18 @@ public class HConnectionManager {
     public HRegionLocation locateRegion(final byte [] tableName,
         final byte [] row)
     throws IOException{
-      return locateRegion(tableName, row, true);
+      return locateRegion(tableName, row, true, true);
     }
 
     @Override
     public HRegionLocation relocateRegion(final byte [] tableName,
         final byte [] row)
     throws IOException{
-      return locateRegion(tableName, row, false);
+      return locateRegion(tableName, row, false, true);
     }
 
     private HRegionLocation locateRegion(final byte [] tableName,
-      final byte [] row, boolean useCache)
+      final byte [] row, boolean useCache, boolean retry)
     throws IOException {
       if (this.closed) throw new IOException(toString() + " closed");
       if (tableName == null || tableName.length == 0) {
@@ -940,11 +940,11 @@ public class HConnectionManager {
         }
       } else if (Bytes.equals(tableName, HConstants.META_TABLE_NAME)) {
         return locateRegionInMeta(HConstants.ROOT_TABLE_NAME, tableName, row,
-          useCache, metaRegionLock);
+          useCache, metaRegionLock, retry);
       } else {
         // Region not in the cache - have to go to the meta RS
         return locateRegionInMeta(HConstants.META_TABLE_NAME, tableName, row,
-          useCache, userRegionLock);
+          useCache, userRegionLock, retry);
       }
     }
 
@@ -1014,7 +1014,7 @@ public class HConnectionManager {
       */
     private HRegionLocation locateRegionInMeta(final byte [] parentTable,
       final byte [] tableName, final byte [] row, boolean useCache,
-      Object regionLockObject)
+      Object regionLockObject, boolean retry)
     throws IOException {
       HRegionLocation location;
       // If we are supposed to be using the cache, look in the cache to see if
@@ -1025,14 +1025,14 @@ public class HConnectionManager {
           return location;
         }
       }
-
+      int localNumRetries = retry ? numRetries : 1;
       // build the key of the meta region we should be looking for.
       // the extra 9's on the end are necessary to allow "exact" matches
       // without knowing the precise region names.
       byte [] metaKey = HRegionInfo.createRegionName(tableName, row,
         HConstants.NINES, false);
       for (int tries = 0; true; tries++) {
-        if (tries >= numRetries) {
+        if (tries >= localNumRetries) {
           throw new NoServerForRegionException("Unable to find region for "
             + Bytes.toStringBinary(row) + " after " + numRetries + " tries.");
         }
@@ -1040,7 +1040,7 @@ public class HConnectionManager {
         HRegionLocation metaLocation = null;
         try {
           // locate the root or meta region
-          metaLocation = locateRegion(parentTable, metaKey);
+          metaLocation = locateRegion(parentTable, metaKey, true, false);
           // If null still, go around again.
           if (metaLocation == null) continue;
           ClientProtocol server =
@@ -1891,7 +1891,7 @@ public class HConnectionManager {
           final Row row = aAction.getAction();
 
           if (row != null) {
-            final HRegionLocation loc = hci.locateRegion(this.tableName, row.getRow(), true);
+            final HRegionLocation loc = hci.locateRegion(this.tableName, row.getRow());
             if (loc == null) {
               throw new IOException("No location found, aborting submit.");
             }