HBASE-14780 Integration Test that run with chaos monkey must specify cfs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0207da8c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0207da8c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0207da8c Branch: refs/heads/hbase-12439 Commit: 0207da8cee1c4d3dd38d38ac45eda5324a713490 Parents: 867a5ea Author: Jonathan M Hsieh <jmhs...@apache.org> Authored: Fri Nov 6 11:39:51 2015 -0800 Committer: Jonathan M Hsieh <jmhs...@apache.org> Committed: Tue Nov 10 15:02:23 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/IntegrationTestBase.java | 8 ++++++++ .../hadoop/hbase/IntegrationTestDDLMasterFailover.java | 4 ++-- .../hadoop/hbase/IntegrationTestRegionReplicaPerf.java | 4 +++- .../hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java | 5 ++++- .../mapreduce/IntegrationTestTableSnapshotInputFormat.java | 8 +++----- 5 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0207da8c/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java index 097673a..3929524 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBase.java @@ -203,7 +203,15 @@ public abstract class IntegrationTestBase extends AbstractHBaseTool { public abstract int runTestFromCommandLine() throws Exception; + /** + * Provides the name of the table that is protected from random Chaos monkey activity + * @return table to not delete. + */ public abstract TableName getTablename(); + /** + * Provides the name of the CFs that are protected from random Chaos monkey activity (alter) + * @return set of cf names to protect. + */ protected abstract Set<String> getColumnFamilies(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/0207da8c/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java index 3ba7818..dffde55 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java @@ -954,12 +954,12 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase { @Override public TableName getTablename() { - return null; + return null; // This test is not inteded to run with stock Chaos Monkey } @Override protected Set<String> getColumnFamilies() { - return null; + return null; // This test is not inteded to run with stock Chaos Monkey } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hbase/blob/0207da8c/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java index 3c29f4c..d05e039 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase; import com.google.common.base.Objects; +import com.google.common.collect.Sets; import com.yammer.metrics.core.Histogram; import org.apache.commons.cli.CommandLine; import org.apache.commons.logging.Log; @@ -33,6 +34,7 @@ import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy; import org.apache.hadoop.hbase.testclassification.IntegrationTests; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.YammerHistogramUtils; import org.apache.hadoop.mapreduce.Counters; import org.apache.hadoop.mapreduce.Job; @@ -234,7 +236,7 @@ public class IntegrationTestRegionReplicaPerf extends IntegrationTestBase { @Override protected Set<String> getColumnFamilies() { - return null; + return Sets.newHashSet(Bytes.toString(PerformanceEvaluation.FAMILY_NAME)); } /** Compute the mean of the given {@code stat} from a timing results. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/0207da8c/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java index b9f97a7..1a8aff6 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import com.google.common.base.Joiner; +import com.google.common.collect.Sets; import org.apache.commons.cli.CommandLine; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; @@ -79,6 +80,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; @@ -778,7 +780,8 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase { @Override protected Set<String> getColumnFamilies() { - return null; + return Sets.newHashSet(Bytes.toString(CHAIN_FAM) , Bytes.toString(DATA_FAM), + Bytes.toString(SORT_FAM)); } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hbase/blob/0207da8c/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java index 55da93e..1a152e8 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java @@ -174,15 +174,13 @@ public class IntegrationTestTableSnapshotInputFormat extends IntegrationTestBase return 0; } - @Override // CM is not intended to be run with this test + @Override // Chaos Monkey is not intended to be run with this test public TableName getTablename() { return null; } - @Override - protected Set<String> getColumnFamilies() { - return null; - } + @Override // Chaos Monkey is not inteded to be run with this test + protected Set<String> getColumnFamilies() { return null; } public static void main(String[] args) throws Exception { Configuration conf = HBaseConfiguration.create();
