From edf2b7901aac3a2d53dfcf88665a5b070597c51c Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Wed, 13 Jul 2011 08:57:50 +0000
Subject: [PATCH] HBASE-3904 Reapply patch v6 for TRUNK with addendum

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1145914 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop/hbase/client/HBaseAdmin.java       | 86 ++++++++++---------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index cf13e8e1a4a..8c44fde3a2d 100644
--- a/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.InterruptedIOException;
 import java.net.SocketTimeoutException;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -333,49 +334,52 @@ public class HBaseAdmin implements Abortable, Closeable {
     } catch (SocketTimeoutException ste) {
       LOG.warn("Creating " + desc.getNameAsString() + " took too long", ste);
     }
-    int numRegs = splitKeys == null ? 1 : splitKeys.length+1;
-    for (int tries = 0; tries < numRetries; tries++) {
-      try {
-        // Wait for new table to come on-line
-        final AtomicInteger actualRegCount = new AtomicInteger(0);
-
-        MetaScannerVisitor visitor = new MetaScannerVisitor() {
-          public boolean processRow(Result rowResult) throws IOException {
-            HRegionInfo info = Writables.getHRegionInfo(
-                rowResult.getValue(HConstants.CATALOG_FAMILY,
-                    HConstants.REGIONINFO_QUALIFIER));
-
-            if (!(Bytes.equals(info.getTableName(), desc.getName()))) {
-              return false;
-            }
-
-            String hostAndPort = null;
-            byte [] value = rowResult.getValue(HConstants.CATALOG_FAMILY,
-                HConstants.SERVER_QUALIFIER);
-            if (value != null && value.length > 0) {
-              hostAndPort = Bytes.toString(value);
-            }
-
-            if (!(info.isOffline() || info.isSplit()) && hostAndPort != null) {
-              actualRegCount.incrementAndGet();
-            }
-            return true;
+    int numRegs = splitKeys == null ? 1 : splitKeys.length + 1;
+    int prevRegCount = 0;
+    for (int tries = 0; tries < numRetries; ++tries) {
+      // Wait for new table to come on-line
+      final AtomicInteger actualRegCount = new AtomicInteger(0);
+      MetaScannerVisitor visitor = new MetaScannerVisitor() {
+        @Override
+        public boolean processRow(Result rowResult) throws IOException {
+          HRegionInfo info = Writables.getHRegionInfo(
+              rowResult.getValue(HConstants.CATALOG_FAMILY,
+                  HConstants.REGIONINFO_QUALIFIER));
+          if (!(Bytes.equals(info.getTableName(), desc.getName()))) {
+            return false;
           }
-
-        };
-        MetaScanner.metaScan(conf, visitor, desc.getName());
-        if (actualRegCount.get() == numRegs)
-          break;
-      } catch (RegionException e) {
-        if (tries == numRetries - 1) {
-          // Ran out of tries
-          throw e;
+          String hostAndPort = null;
+          byte [] value = rowResult.getValue(HConstants.CATALOG_FAMILY,
+              HConstants.SERVER_QUALIFIER);
+          // Make sure that regions are assigned to server
+          if (value != null && value.length > 0) {
+            hostAndPort = Bytes.toString(value);
+          }
+          if (!(info.isOffline() || info.isSplit()) && hostAndPort != null) {
+            actualRegCount.incrementAndGet();
+          }
+          return true;
         }
-      }
-      try {
-        Thread.sleep(getPauseTime(tries));
-      } catch (InterruptedException e) {
-        // Just continue; ignore the interruption.
+      };
+      MetaScanner.metaScan(conf, visitor, desc.getName());
+      if (actualRegCount.get() != numRegs) {
+        if (tries == numRetries - 1) {
+          throw new RegionOfflineException("Only " + actualRegCount.get() + 
+              " of " + numRegs + " regions are online; retries exhausted.");
+        }
+        try { // Sleep
+          Thread.sleep(getPauseTime(tries));
+        } catch (InterruptedException e) {
+          throw new InterruptedIOException("Interrupted when opening" +
+              " regions; " + actualRegCount.get() + " of " + numRegs + 
+              " regions processed so far");
+        }
+        if (actualRegCount.get() > prevRegCount) { // Making progress
+          prevRegCount = actualRegCount.get();
+          tries = -1;
+        }
+      } else {
+        return;
       }
     }
   }