HBASE-14780 Integration Test that run with chaos monkey must specify cfs

apache · Nov 10, 2015 · 0207da8 · 0207da8
1 parent 867a5ea
commit 0207da8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
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
@@ -203,7 +203,15 @@ public void cleanUpCluster() throws Exception {
 
   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();
 }
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
@@ -954,12 +954,12 @@ private int runTest() throws Exception {
 
   @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 {

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
@@ -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.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 TableName getTablename() {
 
   @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. */

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
@@ -22,6 +22,7 @@
 
 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.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 static TableName getTableName(Configuration conf) {
 
   @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 {

diff --git a/.../test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java b/.../test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java
@@ -174,15 +174,13 @@ public int runTestFromCommandLine() throws Exception {
     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();