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

HBASE-3212 More testing of enable/disable uncovered base condition not in place; i.e. that only one enable/disable runs at a time 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1033303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-11-10 00:18:00 +00:00
parent fb4b83d41c
commit 3faee0a292
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -665,6 +665,8 @@ Release 0.90.0 - Unreleased
HBASE-3207 If we get IOException when closing a region, we should still
remove it from online regions and complete the close in ZK
HBASE-3199 large response handling: some fixups and cleanups
HBASE-3212 More testing of enable/disable uncovered base condition not in
place; i.e. that only one enable/disable runs at a time
IMPROVEMENTS

5
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -513,8 +513,11 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
conf.getInt("hbase.master.executor.serverops.threads", 3));
this.executorService.startExecutorService(ExecutorType.MASTER_META_SERVER_OPERATIONS,
conf.getInt("hbase.master.executor.serverops.threads", 2));
// We depend on there being only one instance of this executor running
// at a time. To do concurrency, would need fencing of enable/disable of
// tables.
this.executorService.startExecutorService(ExecutorType.MASTER_TABLE_OPERATIONS,
conf.getInt("hbase.master.executor.tableops.threads", 3));
conf.getInt("hbase.master.executor.tableops.threads", 1));
// Put up info server.
int port = this.conf.getInt("hbase.master.info.port", 60010);

2
src/main/java/org/apache/hadoop/hbase/master/handler/ClosedRegionHandler.java
View File

@ -83,7 +83,7 @@ public class ClosedRegionHandler extends EventHandler implements TotesHRegionInf
LOG.debug("Handling CLOSED event for " + regionInfo.getEncodedName());
// Check if this table is being disabled or not
if (this.assignmentManager.getZKTable().
isDisabledTable(this.regionInfo.getTableDesc().getNameAsString())) {
isDisablingOrDisabledTable(this.regionInfo.getTableDesc().getNameAsString())) {
assignmentManager.offlineDisabledRegion(regionInfo);
return;
}

2
src/main/java/org/apache/hadoop/hbase/master/handler/OpenedRegionHandler.java
View File

@ -92,7 +92,7 @@ public class OpenedRegionHandler extends EventHandler implements TotesHRegionInf
regionInfo.getEncodedName() + ")", e);
}
this.assignmentManager.regionOnline(regionInfo, serverInfo);
if (this.assignmentManager.getZKTable().isDisabledTable(
if (this.assignmentManager.getZKTable().isDisablingOrDisabledTable(
regionInfo.getTableDesc().getNameAsString())) {
LOG.debug("Opened region " + regionInfo.getRegionNameAsString() + " but "
+ "this table is disabled, triggering close of region");