hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-12-17 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 f8870cbbc -> 24b40cb90


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

Branch: refs/heads/branch-1.2
Commit: 24b40cb908e215bb28d2660be4d401469237356f
Parents: f8870cb
Author: Jonathan M Hsieh 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Sean Busbey 
Committed: Thu Dec 17 16:03:04 2015 -0600

--
 .../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/24b40cb9/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 getColumnFamilies();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/24b40cb9/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 f460aa9..b4a7647 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
@@ -794,12 +794,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 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/24b40cb9/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 getColumnFamilies() {
-return null;
+return Sets.newHashSet(Bytes.toString(PerformanceEvaluation.FAMILY_NAME));
   }
 
   /** Compute the mean of the

[07/17] hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-11-12 Thread syuanjiang 
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 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh 
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 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 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 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/rep

hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-11-10 Thread jmhsieh 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 4456db684 -> 805857f4e


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

Conflicts:

hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
 (not in branch-1)

hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
 (imports fixes)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/805857f4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/805857f4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/805857f4

Branch: refs/heads/branch-1.0
Commit: 805857f4e46ee80ea9a4b28b21b3389fa8df719b
Parents: 4456db6
Author: Jonathan M Hsieh 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh 
Committed: Tue Nov 10 15:21:07 2015 -0800

--
 .../org/apache/hadoop/hbase/IntegrationTestBase.java |  8 
 .../hbase/IntegrationTestRegionReplicaPerf.java  |  4 +++-
 .../hbase/mapreduce/IntegrationTestBulkLoad.java | 15 ++-
 .../IntegrationTestTableSnapshotInputFormat.java |  8 +++-
 4 files changed, 28 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/805857f4/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 f45fb04..334c1a8 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
@@ -192,7 +192,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 getColumnFamilies();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/805857f4/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 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/805857f4/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 87c3c75..2857ab5 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
@@ -29,6 +29,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.base.Joiner;
+import com.google.common.collect.Sets;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.lang.RandomStringUtils;

hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-11-10 Thread jmhsieh 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 fa5f17bb6 -> 29b346476


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

Branch: refs/heads/branch-1.1
Commit: 29b34647670c2e9d26dc738f718db8814209cee2
Parents: fa5f17b
Author: Jonathan M Hsieh 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh 
Committed: Tue Nov 10 15:11:14 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/29b34647/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 getColumnFamilies();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/29b34647/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 f460aa9..b4a7647 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
@@ -794,12 +794,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 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/29b34647/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 getColumnFamilies() {
-return null;
+return Sets.newHashSet(Bytes.toString(PerformanceEvaluation.FAMILY_NAME));
   }
 
   /** Compute the mean o

hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-11-10 Thread jmhsieh 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 1d29d8c00 -> f782cab42


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

Branch: refs/heads/branch-1
Commit: f782cab42156291bfe659e5922ff53d80c5a
Parents: 1d29d8c
Author: Jonathan M Hsieh 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh 
Committed: Tue Nov 10 15:09:35 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/f782cab4/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 getColumnFamilies();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/f782cab4/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 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/f782cab4/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 getColumnFamilies() {
-return null;
+return Sets.newHashSet(Bytes.toString(PerformanceEvaluation.FAMILY_NAME));
   }
 
   /** Compute the mean of th

hbase git commit: HBASE-14780 Integration Test that run with chaos monkey must specify cfs

2015-11-10 Thread jmhsieh 
Repository: hbase
Updated Branches:
  refs/heads/master 867a5ea18 -> 0207da8ce


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/master
Commit: 0207da8cee1c4d3dd38d38ac45eda5324a713490
Parents: 867a5ea
Author: Jonathan M Hsieh 
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh 
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 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 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 getColumnFamilies() {
-return null;
+return Sets.newHashSet(Bytes.toString(PerformanceEvaluation.FAMILY_NAME));
   }
 
   /** Compute the mean of the gi