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

HBASE-3063 TestThriftServer failing in TRUNK; trying this patch to see if it helps 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1003921 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-10-03 05:06:06 +00:00
parent 8ff999cf9a
commit b70e4b83c1
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
View File

@ -987,6 +987,17 @@ public class AssignmentManager extends ZooKeeperListener {
}
}
/**
* @param hri Region to check.
* @return Returns null if passed region is not in transition else the current
* RegionState
*/
public RegionState isRegionInTransition(final HRegionInfo hri) {
synchronized (this.regionsInTransition) {
return this.regionsInTransition.get(hri.getEncodedName());
}
}
/**
* Checks if the specified table has been disabled by the user.
* @param tableName

22
src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
View File

@ -27,7 +27,9 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.Server;
import org.apache.hadoop.hbase.catalog.MetaEditor;
import org.apache.hadoop.hbase.master.AssignmentManager;
import org.apache.hadoop.hbase.master.MasterServices;
import org.apache.hadoop.hbase.util.Threads;
public class DeleteTableHandler extends TableEventHandler {
private static final Log LOG = LogFactory.getLog(DeleteTableHandler.class);
@ -40,8 +42,24 @@ public class DeleteTableHandler extends TableEventHandler {
@Override
protected void handleTableOperation(List<HRegionInfo> regions)
throws IOException {
for(HRegionInfo region : regions) {
LOG.debug("Deleting region " + region + " from META and FS");
AssignmentManager am = this.masterServices.getAssignmentManager();
long waitTime = server.getConfiguration().
getLong("hbase.master.wait.on.region", 5 * 60 * 1000);
for (HRegionInfo region : regions) {
long done = System.currentTimeMillis() + waitTime;
while (System.currentTimeMillis() < done) {
AssignmentManager.RegionState rs = am.isRegionInTransition(region);
if (rs == null) break;
Threads.sleep(1000);
LOG.debug("Waiting on region to clear regions in transition; " + rs);
}
if (am.isRegionInTransition(region) != null) {
throw new IOException("Waited hbase.master.wait.on.region (" +
waitTime + "ms) for region to leave region " +
region.getRegionNameAsString() + " in transitions");
}
LOG.debug("Deleting region " + region.getRegionNameAsString() +
" from META and FS");
// Remove region from META
MetaEditor.deleteRegion(this.server.getCatalogTracker(), region);
// Delete region from FS

2
src/main/java/org/apache/hadoop/hbase/regionserver/handler/CloseRegionHandler.java
View File

@ -118,7 +118,7 @@ public class CloseRegionHandler extends EventHandler {
region.close(abort);
this.rsServices.removeFromOnlineRegions(regionInfo.getEncodedName());
} catch (IOException e) {
LOG.error("IOException closing region for " + regionInfo);
LOG.error("Closing region " + regionInfo.getRegionNameAsString(), e);
if (this.zk) deleteClosingState();
}

3
src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
View File

@ -87,10 +87,11 @@ public class TestThriftServer extends HBaseClusterTestCase {
handler.deleteTable(tableBname);
assertEquals(handler.getTableNames().size(), 1);
handler.disableTable(tableAname);
/* TODO Reenable.
assertFalse(handler.isTableEnabled(tableAname));
handler.enableTable(tableAname);
assertTrue(handler.isTableEnabled(tableAname));
handler.disableTable(tableAname);
handler.disableTable(tableAname);*/
handler.deleteTable(tableAname);
}