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

HBASE-3898 TestSplitTransactionOnCluster broke in TRUNK -- retry 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1125045 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-05-19 18:34:32 +00:00
parent b192163701
commit 557ce312af
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
View File

@ -129,6 +129,11 @@ public class CompactSplitThread implements CompactionRequestor {
} }
public synchronized void requestSplit(final HRegion r, byte[] midKey) { public synchronized void requestSplit(final HRegion r, byte[] midKey) {
if (midKey == null) {
LOG.debug("Region " + r.getRegionNameAsString() +
" not splittable because midkey=null");
return;
}
try { try {
this.splits.execute(new SplitRequest(r, midKey, this.server)); this.splits.execute(new SplitRequest(r, midKey, this.server));
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {

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

@ -156,6 +156,8 @@ public class SplitTransaction {
*/ */
public boolean prepare() { public boolean prepare() {
if (this.parent.isClosed() || this.parent.isClosing()) return false; if (this.parent.isClosed() || this.parent.isClosing()) return false;
// Split key can be false if this region is unsplittable; i.e. has refs.
if (this.splitrow == null) return false;
HRegionInfo hri = this.parent.getRegionInfo(); HRegionInfo hri = this.parent.getRegionInfo();
parent.prepareToSplit(); parent.prepareToSplit();
// Check splitrow. // Check splitrow.