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

HBASE-7977 Online merge should acquire table lock 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1462385 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2013-03-29 02:46:28 +00:00
parent c21ed33937
commit 973d38db30
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeRequest.java
View File

@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.RemoteExceptionHandler;
import org.apache.hadoop.hbase.master.TableLockManager.TableLock;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils;
@ -39,6 +40,7 @@ class RegionMergeRequest implements Runnable {
private final HRegion region_b; private final HRegion region_b;
private final HRegionServer server; private final HRegionServer server;
private final boolean forcible; private final boolean forcible;
private TableLock tableLock;
RegionMergeRequest(HRegion a, HRegion b, HRegionServer hrs, boolean forcible) { RegionMergeRequest(HRegion a, HRegion b, HRegionServer hrs, boolean forcible) {
Preconditions.checkNotNull(hrs); Preconditions.checkNotNull(hrs);
@ -65,6 +67,18 @@ class RegionMergeRequest implements Runnable {
final long startTime = EnvironmentEdgeManager.currentTimeMillis(); final long startTime = EnvironmentEdgeManager.currentTimeMillis();
RegionMergeTransaction mt = new RegionMergeTransaction(region_a, RegionMergeTransaction mt = new RegionMergeTransaction(region_a,
region_b, forcible); region_b, forcible);
//acquire a shared read lock on the table, so that table schema modifications
//do not happen concurrently
tableLock = server.getTableLockManager().readLock(region_a.getTableDesc().getName()
, "MERGE_REGIONS:" + region_a.getRegionNameAsString() + ", " + region_b.getRegionNameAsString());
try {
tableLock.acquire();
} catch (IOException ex) {
tableLock = null;
throw ex;
}
// If prepare does not return true, for some reason -- logged inside in // If prepare does not return true, for some reason -- logged inside in
// the prepare call -- we are not ready to merge just now. Just return. // the prepare call -- we are not ready to merge just now. Just return.
if (!mt.prepare(this.server)) return; if (!mt.prepare(this.server)) return;
@ -107,6 +121,19 @@ class RegionMergeRequest implements Runnable {
LOG.error("Merge failed " + this, LOG.error("Merge failed " + this,
RemoteExceptionHandler.checkIOException(ex)); RemoteExceptionHandler.checkIOException(ex));
server.checkFileSystem(); server.checkFileSystem();
} finally {
releaseTableLock();
}
}
protected void releaseTableLock() {
if (this.tableLock != null) {
try {
this.tableLock.release();
} catch (IOException ex) {
LOG.warn("Could not release the table lock", ex);
//TODO: if we get here, and not abort RS, this lock will never be released
}
} }
} }
} }