Repository: hbase Updated Branches: refs/heads/master 7f9ec9583 -> 85853f69c
HBASE-11316 Expand info about compactions beyond HBASE-11120 ADDENDUM TO FIX BROKE TESTS Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/85853f69 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/85853f69 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/85853f69 Branch: refs/heads/master Commit: 85853f69c88c08db61af7fb6ef3b5432f926e531 Parents: 7f9ec95 Author: stack <st...@apache.org> Authored: Tue Jul 29 19:00:17 2014 -0700 Committer: stack <st...@apache.org> Committed: Tue Jul 29 19:00:17 2014 -0700 ---------------------------------------------------------------------- .../hbase/regionserver/TestDefaultCompactSelection.java | 2 ++ .../compactions/TestStripeCompactionPolicy.java | 10 ++++++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/85853f69/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java index 9a19524..67e036f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java @@ -77,6 +77,8 @@ public class TestDefaultCompactSelection extends TestCase { this.conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, minSize); this.conf.setLong("hbase.hstore.compaction.max.size", maxSize); this.conf.setFloat("hbase.hstore.compaction.ratio", 1.0F); + // Test depends on this not being set to pass. Default breaks test. TODO: Revisit. + this.conf.unset("hbase.hstore.compaction.min.size"); //Setting up a Store Path basedir = new Path(DIR); http://git-wip-us.apache.org/repos/asf/hbase/blob/85853f69/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java index a4f8f5b..540b6d9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java @@ -131,6 +131,8 @@ public class TestStripeCompactionPolicy { public void testSingleStripeCompaction() throws Exception { // Create a special policy that only compacts single stripes, using standard methods. Configuration conf = HBaseConfiguration.create(); + // Test depends on this not being set to pass. Default breaks test. TODO: Revisit. + conf.unset("hbase.hstore.compaction.min.size"); conf.setFloat(CompactionConfiguration.HBASE_HSTORE_COMPACTION_RATIO_KEY, 1.0F); conf.setInt(StripeStoreConfig.MIN_FILES_KEY, 3); conf.setInt(StripeStoreConfig.MAX_FILES_KEY, 4); @@ -251,6 +253,8 @@ public class TestStripeCompactionPolicy { @Test public void testSplitOffStripe() throws Exception { Configuration conf = HBaseConfiguration.create(); + // Test depends on this not being set to pass. Default breaks test. TODO: Revisit. + conf.unset("hbase.hstore.compaction.min.size"); // First test everything with default split count of 2, then split into more. conf.setInt(StripeStoreConfig.MIN_FILES_KEY, 2); Long[] toSplit = new Long[] { defaultSplitSize - 2, 1L, 1L }; @@ -281,6 +285,10 @@ public class TestStripeCompactionPolicy { public void testSplitOffStripeOffPeak() throws Exception { // for HBASE-11439 Configuration conf = HBaseConfiguration.create(); + + // Test depends on this not being set to pass. Default breaks test. TODO: Revisit. + conf.unset("hbase.hstore.compaction.min.size"); + conf.setInt(StripeStoreConfig.MIN_FILES_KEY, 2); // Select the last 2 files. StripeCompactionPolicy.StripeInformationProvider si = @@ -391,6 +399,8 @@ public class TestStripeCompactionPolicy { @Test public void testSingleStripeDropDeletes() throws Exception { Configuration conf = HBaseConfiguration.create(); + // Test depends on this not being set to pass. Default breaks test. TODO: Revisit. + conf.unset("hbase.hstore.compaction.min.size"); StripeCompactionPolicy policy = createPolicy(conf); // Verify the deletes can be dropped if there are no L0 files. Long[][] stripes = new Long[][] { new Long[] { 3L, 2L, 2L, 2L }, new Long[] { 6L } };
