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.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@680422 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Kellerman 2008-07-28 17:57:11 +00:00
parent 5af2380bac
commit 37b6f7e42e
2 changed files with 9 additions and 5 deletions

View File

@ -217,6 +217,7 @@ Release 0.2.0
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

View File

@ -55,11 +55,14 @@ abstract class TableOperation implements HConstants {
}
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);
}