Repository: hbase Updated Branches: refs/heads/master 01a286936 -> 40f8d20cf
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. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/40f8d20c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/40f8d20c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/40f8d20c Branch: refs/heads/master Commit: 40f8d20cf7b297a9324319190d03d93563230d6e Parents: 01a2869 Author: Michael Stack <st...@apache.org> Authored: Thu Feb 15 20:43:47 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Thu Feb 15 20:46:32 2018 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/master/assignment/SplitTableRegionProcedure.java | 1 - .../main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java | 2 +- .../test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/40f8d20c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java index be0741d..c139566 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java @@ -225,7 +225,6 @@ public class SplitTableRegionProcedure setNextState(SplitTableRegionState.SPLIT_TABLE_REGION_PRE_OPERATION); break; } else { - assert isFailed() : "split region should have an exception here"; return Flow.NO_MORE_STATE; } case SPLIT_TABLE_REGION_PRE_OPERATION: http://git-wip-us.apache.org/repos/asf/hbase/blob/40f8d20c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java index a32a493..58f8f81 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java @@ -120,7 +120,7 @@ public class StoreUtils { if (comparator.compareRows(midKey, firstKey) == 0 || comparator.compareRows(midKey, lastKey) == 0) { 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(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/40f8d20c/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java index c39afdd..4513dd2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java @@ -38,6 +38,7 @@ import org.apache.htrace.core.TraceScope; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; 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; +@Ignore // We don't support htrace in hbase-2.0.0 and this flakey is a little flakey. @Category({MiscTests.class, MediumTests.class}) public class TestHTraceHooks {