svn commit: r1515137 - in /hbase/trunk: hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[jx...@apache.org]

Author: jxiang
Date: Sun Aug 18 15:33:24 2013
New Revision: 1515137

URL: http://svn.apache.org/r1515137
Log:
HBASE-9234 Rebuilding user regions should ignore system tables

Modified:
    hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java?rev=1515137&r1=1515136&r2=1515137&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java Sun Aug 18 15:33:24 2013
@@ -84,6 +84,7 @@ public final class TableName implements 
   private String namespaceAsString;
   private byte[] qualifier;
   private String qualifierAsString;
+  private boolean systemTable;
 
   private TableName() {}
 
@@ -209,6 +210,10 @@ public final class TableName implements 
     return name;
   }
 
+  public boolean isSystemTable() {
+    return systemTable;
+  }
+
   @Override
   public String toString() {
     return nameAsString;
@@ -251,6 +256,8 @@ public final class TableName implements 
     tableName.nameAsString =
         createFullyQualified(tableName.namespaceAsString, tableName.qualifierAsString);
     tableName.name = Bytes.toBytes(tableName.nameAsString);
+    tableName.systemTable = Bytes.equals(
+      tableName.namespace, NamespaceDescriptor.SYSTEM_NAMESPACE_NAME);
   }
 
   public static TableName valueOf(byte[] name) {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1515137&r1=1515136&r2=1515137&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Sun Aug 18 15:33:24 2013
@@ -2655,6 +2655,8 @@ public class AssignmentManager extends Z
       HRegionInfo regionInfo = region.getFirst();
       ServerName regionLocation = region.getSecond();
       if (regionInfo == null) continue;
+      TableName tableName = regionInfo.getTableName();
+      if (tableName.isSystemTable()) continue;
       regionStates.createRegionState(regionInfo);
       if (regionStates.isRegionInState(regionInfo, State.SPLIT)) {
         // Split is considered to be completed. If the split znode still
@@ -2663,7 +2665,6 @@ public class AssignmentManager extends Z
            + " split is completed. Hence need not add to regions list");
         continue;
       }
-      TableName tableName = regionInfo.getTableName();
       if (regionLocation == null) {
         // regionLocation could be null if createTable didn't finish properly.
         // When createTable is in progress, HMaster restarts.