Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (revision 1506389) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (working copy) @@ -60,7 +60,7 @@ private final AssignmentManager assignmentManager; private final TableLockManager tableLockManager; private final CatalogTracker catalogTracker; - private boolean retainAssignment = false; + private boolean skipTableStateCheck = false; private TableLock tableLock; public EnableTableHandler(Server server, byte [] tableName, @@ -72,7 +72,7 @@ this.catalogTracker = catalogTracker; this.assignmentManager = assignmentManager; this.tableLockManager = tableLockManager; - this.retainAssignment = skipTableStateCheck; + this.skipTableStateCheck = skipTableStateCheck; } public EnableTableHandler prepare() @@ -87,7 +87,7 @@ // Check if table exists if (!MetaReader.tableExists(catalogTracker, this.tableNameStr)) { // retainAssignment is true only during recovery. In normal case it is false - if (!this.retainAssignment) { + if (!this.skipTableStateCheck) { throw new TableNotFoundException(tableNameStr); } try { @@ -103,7 +103,7 @@ // the table at the same time. Ensure only the first request is honored // After that, no other requests can be accepted until the table reaches // DISABLED or ENABLED. - if (!retainAssignment) { + if (!skipTableStateCheck) { try { if (!this.assignmentManager.getZKTable().checkDisabledAndSetEnablingTable (this.tableNameStr)) { @@ -188,7 +188,7 @@ LOG.info("Table '" + this.tableNameStr + "' has " + countOfRegionsInTable + " regions, of which " + regionsCount + " are offline."); BulkEnabler bd = new BulkEnabler(this.server, regions, countOfRegionsInTable, - this.retainAssignment); + true); try { if (bd.bulkAssign()) { done = true; @@ -225,7 +225,7 @@ HRegionInfo hri = regionLocation.getFirst(); ServerName sn = regionLocation.getSecond(); if (!regionStates.isRegionInTransition(hri) && !regionStates.isRegionAssigned(hri)) { - if (this.retainAssignment && sn != null && serverManager.isServerOnline(sn)) { + if (sn != null && serverManager.isServerOnline(sn)) { this.assignmentManager.addPlan(hri.getEncodedName(), new RegionPlan(hri, null, sn)); } regions.add(hri);