Repository: hbase Updated Branches: refs/heads/master dc03942ed -> 47787f2c3
HBASE-13254 EnableTableHandler#prepare would not throw TableNotFoundException during recovery (Stephen Jiang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47787f2c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47787f2c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47787f2c Branch: refs/heads/master Commit: 47787f2c3aeaaff16fb06563de654f6f5f504726 Parents: dc03942 Author: tedyu <[email protected]> Authored: Mon Mar 16 17:50:16 2015 -0700 Committer: tedyu <[email protected]> Committed: Mon Mar 16 17:50:16 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/master/handler/EnableTableHandler.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/47787f2c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java index c4969be..c7145fd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java @@ -92,11 +92,7 @@ public class EnableTableHandler extends EventHandler { try { // Check if table exists if (!MetaTableAccessor.tableExists(this.server.getConnection(), tableName)) { - // retainAssignment is true only during recovery. In normal case it is false - if (!this.skipTableStateCheck) { - throw new TableNotFoundException(tableName); - } - this.assignmentManager.getTableStateManager().setDeletedTable(tableName); + throw new TableNotFoundException(tableName); } // There could be multiple client requests trying to disable or enable
