svn commit: r680422 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/master/TableOperation.java

[jimk]

Author: jimk
Date: Mon Jul 28 10:57:11 2008
New Revision: 680422

URL: http://svn.apache.org/viewvc?rev=680422&view=rev
Log:
HBASE-424   Should be able to enable/disable .META. table

Fixed enable table so that it no longer waits for the META table to become 
available when enabling the META table.

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=680422&r1=680421&r2=680422&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Jul 28 10:57:11 2008
@@ -217,6 +217,7 @@
    HBASE-766   FileNotFoundException trying to load HStoreFile 'data'
    HBASE-770   Update HBaseRPC to match hadoop 0.17 RPC
    HBASE-780   Can't scan '.META.' from new shell
+   HBASE-424   Should be able to enable/disable .META. table
    
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java?rev=680422&r1=680421&r2=680422&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java 
(original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java 
Mon Jul 28 10:57:11 2008
@@ -55,11 +55,14 @@
     }
     this.tableName = tableName;
 
-    // We can not access any meta region if they have not already been
-    // assigned and scanned.
-    if (master.regionManager.metaScannerThread.waitForMetaRegionsOrClose()) {
-      // We're shutting down. Forget it.
-      throw new MasterNotRunningException(); 
+    // Don't wait for META table to come on line if we're enabling it
+    if (!Bytes.equals(HConstants.META_TABLE_NAME, this.tableName)) {
+      // We can not access any meta region if they have not already been
+      // assigned and scanned.
+      if (master.regionManager.metaScannerThread.waitForMetaRegionsOrClose()) {
+        // We're shutting down. Forget it.
+        throw new MasterNotRunningException(); 
+      }
     }
     this.metaRegions = master.regionManager.getMetaRegionsForTable(tableName);
   }