hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness

2018-03-12 Thread toffer 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 0d81bd171 -> 96a029c0f


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/96a029c0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96a029c0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96a029c0

Branch: refs/heads/branch-1.3
Commit: 96a029c0f6da60a2a78787fd9daa06d9cc287b71
Parents: 0d81bd1
Author: Francis Liu 
Authored: Mon Mar 12 16:57:44 2018 -0700
Committer: Francis Liu 
Committed: Mon Mar 12 17:03:06 2018 -0700

--
 .../regionserver/TestRegionMergeTransactionOnCluster.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/96a029c0/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);

hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness

2018-03-12 Thread toffer 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 15d75e4fc -> 10076c2fa


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/10076c2f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/10076c2f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/10076c2f

Branch: refs/heads/branch-1.4
Commit: 10076c2fa92d542ae3f193abf11e0e2c36fcc499
Parents: 15d75e4
Author: Francis Liu 
Authored: Mon Mar 12 16:57:44 2018 -0700
Committer: Francis Liu 
Committed: Mon Mar 12 16:58:44 2018 -0700

--
 .../regionserver/TestRegionMergeTransactionOnCluster.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/10076c2f/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);

hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness

2018-03-12 Thread toffer 
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 
Authored: Mon Mar 12 16:57:44 2018 -0700
Committer: Francis Liu 
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);