svn commit: r773168 - /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java

[st...@apache.org]

Author: stack
Date: Sat May  9 06:08:58 2009
New Revision: 773168

URL: http://svn.apache.org/viewvc?rev=773168&view=rev
Log:
HBASE-1344  WARN IllegalStateException: Cannot set a region as open if it has not been pending -- part2

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java?rev=773168&r1=773167&r2=773168&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java Sat May  9 06:08:58 2009
@@ -336,24 +336,23 @@
     }
     HServerInfo storedInfo = null;
     synchronized (this.master.regionManager) {
+      /*
+       * We don't assign regions that are offline, in transition or were on
+       * a dead server. Regions that were on a dead server will get reassigned
+       * by ProcessServerShutdown
+       */
+      if (info.isOffline() ||
+        this.master.regionManager.
+            regionIsInTransition(info.getRegionNameAsString()) ||
+          (serverName != null && this.master.serverManager.isDead(serverName))) {
+        return;
+      }
       if (serverName != null) {
-        /*
-         * We don't assign regions that are offline, in transition or were on
-         * a dead server. Regions that were on a dead server will get reassigned
-         * by ProcessServerShutdown
-         */
-        if(info.isOffline() ||
-            this.master.regionManager.regionIsInTransition(
-                info.getRegionNameAsString()) ||
-            this.master.serverManager.isDead(serverName)) {
-          return;
-        }
         storedInfo = this.master.serverManager.getServerInfo(serverName);
       }
 
       // If we can't find the HServerInfo, then add it to the list of
       //  unassigned regions.
-
       if (storedInfo == null) {
         // The current assignment is invalid
         if (LOG.isDebugEnabled()) {
@@ -404,4 +403,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}