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 <[email protected]>
Authored: Fri Nov 6 11:39:51 2015 -0800
Committer: Jonathan M Hsieh <[email protected]>
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<String> 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<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/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;
import org.apache.commons.logging.Log;
@@ -81,6 +82,17 @@ import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
+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;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Test Bulk Load and MR on a distributed cluster.
* It starts an MR job that creates linked chains
@@ -767,7 +779,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/805857f4/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();
