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

HBASE-20006 TestRestoreSnapshotFromClientWithRegionReplicas is flakey 

Remove assert in splittableregionprocedure. It was in the prepare.
Was causing fail in legit case where a region split follows a
table split BEFORE the parent has been GC'd. The region split
finds the parent in SPLIT state which is right. The assert was
having us fail. No need.

Also disabled TestHTrace since not supported in 2.0.0 and flakey.
This commit is contained in:
Michael Stack 2018-02-15 20:43:47 -08:00
parent 13bc4fe33c
commit 9f27fdaffc
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
View File

@ -225,7 +225,6 @@ public class SplitTableRegionProcedure
setNextState(SplitTableRegionState.SPLIT_TABLE_REGION_PRE_OPERATION); setNextState(SplitTableRegionState.SPLIT_TABLE_REGION_PRE_OPERATION);
break; break;
} else { } else {
assert isFailed() : "split region should have an exception here";
return Flow.NO_MORE_STATE; return Flow.NO_MORE_STATE;
} }
case SPLIT_TABLE_REGION_PRE_OPERATION: case SPLIT_TABLE_REGION_PRE_OPERATION:

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java
View File

@ -120,7 +120,7 @@ public class StoreUtils {
if (comparator.compareRows(midKey, firstKey) == 0 || if (comparator.compareRows(midKey, firstKey) == 0 ||
comparator.compareRows(midKey, lastKey) == 0) { comparator.compareRows(midKey, lastKey) == 0) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("cannot split because midkey is the same as first or last row"); LOG.debug("cannot split {} because midkey is the same as first or last row", file);
} }
return Optional.empty(); return Optional.empty();
} }

2
hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java
View File

@ -38,6 +38,7 @@ import org.apache.htrace.core.TraceScope;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@ -45,6 +46,7 @@ import org.junit.rules.TestName;
import org.apache.hbase.thirdparty.com.google.common.collect.Sets; import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
@Ignore // We don't support htrace in hbase-2.0.0 and this flakey is a little flakey.
@Category({MiscTests.class, MediumTests.class}) @Category({MiscTests.class, MediumTests.class})
public class TestHTraceHooks { public class TestHTraceHooks {