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

HBASE-20174 Fix TestZKLessMergeOnCluster flakiness

This commit is contained in:
Francis Liu 2018-03-12 16:57:44 -07:00
parent b54a439e50
commit 38471229f9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
View File

@ -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.RegionState.State;
import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.master.RegionStates;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil; 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.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@ -109,6 +111,9 @@ public class TestRegionMergeTransactionOnCluster {
static void setupOnce() throws Exception { static void setupOnce() throws Exception {
// Start a cluster // 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); TEST_UTIL.startMiniCluster(NB_SERVERS);
cluster = TEST_UTIL.getHBaseCluster(); cluster = TEST_UTIL.getHBaseCluster();
master = cluster.getMaster(); master = cluster.getMaster();
@ -235,7 +240,9 @@ public class TestRegionMergeTransactionOnCluster {
for(HColumnDescriptor colFamily : columnFamilies) { for(HColumnDescriptor colFamily : columnFamilies) {
newcount += hrfs.getStoreFiles(colFamily.getName()).size(); 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; break;
} }
Thread.sleep(50); Thread.sleep(50);