You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2018/03/12 23:58:03 UTC
hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness
Repository: hbase
Updated Branches:
refs/heads/branch-1 b54a439e5 -> 38471229f
HBASE-20174 Fix TestZKLessMergeOnCluster flakiness
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/38471229
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/38471229
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/38471229
Branch: refs/heads/branch-1
Commit: 38471229f9bc2a5bf433d50c4ac35c609a96c392
Parents: b54a439
Author: Francis Liu <to...@apache.org>
Authored: Mon Mar 12 16:57:44 2018 -0700
Committer: Francis Liu <to...@apache.org>
Committed: Mon Mar 12 16:57:59 2018 -0700
----------------------------------------------------------------------
.../regionserver/TestRegionMergeTransactionOnCluster.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/38471229/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
index a15508d..0501de3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
@@ -60,6 +60,8 @@ import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.RegionState.State;
import org.apache.hadoop.hbase.master.RegionStates;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos;
+import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -109,6 +111,9 @@ public class TestRegionMergeTransactionOnCluster {
static void setupOnce() throws Exception {
// Start a cluster
+ //Make sure discharger does not interfere with tests that control discharger
+ TEST_UTIL.getConfiguration().setInt(CompactionConfiguration.HBASE_HFILE_COMPACTION_DISCHARGER_INTERVAL,
+ Integer.MAX_VALUE);
TEST_UTIL.startMiniCluster(NB_SERVERS);
cluster = TEST_UTIL.getHBaseCluster();
master = cluster.getMaster();
@@ -235,7 +240,9 @@ public class TestRegionMergeTransactionOnCluster {
for(HColumnDescriptor colFamily : columnFamilies) {
newcount += hrfs.getStoreFiles(colFamily.getName()).size();
}
- if(newcount > count) {
+ if(newcount > count &&
+ //compacted file added to directory, let's make sure compaction is actually done with the commit
+ admin.getCompactionState(tableName) == AdminProtos.GetRegionInfoResponse.CompactionState.NONE) {
break;
}
Thread.sleep(50);