Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13802 Procedure V2: Master fails to come up due to rollback of create namespace table (Stephen Jiang)

This commit is contained in:
tedyu 2015-05-29 02:33:39 -07:00
parent ffcd4d424f
commit 46c9a5b339
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java
View File

@ -269,6 +269,9 @@ public class CreateTableProcedure
@Override @Override
protected boolean acquireLock(final MasterProcedureEnv env) { protected boolean acquireLock(final MasterProcedureEnv env) {
if (!env.isInitialized() && !getTableName().isSystemTable() ) {
return false;
}
return env.getProcedureQueue().tryAcquireTableExclusiveLock(getTableName(), "create table"); return env.getProcedureQueue().tryAcquireTableExclusiveLock(getTableName(), "create table");
} }

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
View File

@ -405,6 +405,8 @@ public class DeleteTableProcedure
protected static void deleteTableStates(final MasterProcedureEnv env, final TableName tableName) protected static void deleteTableStates(final MasterProcedureEnv env, final TableName tableName)
throws IOException { throws IOException {
ProcedureSyncWait.getMasterQuotaManager(env).removeTableFromNamespaceQuota(tableName); if (!tableName.isSystemTable()) {
ProcedureSyncWait.getMasterQuotaManager(env).removeTableFromNamespaceQuota(tableName);
}
} }
} }