You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/07/04 00:03:11 UTC
[1/5] hbase git commit: HBASE-14002 Add --noReplicationSetup option
to IntegrationTestReplication
Repository: hbase
Updated Branches:
refs/heads/0.98 9465a16d8 -> 41306efd3
refs/heads/branch-1 ab9a0b80a -> 67b61005f
refs/heads/branch-1.1 003ca96ee -> 8392861f3
refs/heads/branch-1.2 9daeebbec -> 23d05e60e
refs/heads/master 5b75faefc -> e640f1e76
HBASE-14002 Add --noReplicationSetup option to IntegrationTestReplication
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e640f1e7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e640f1e7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e640f1e7
Branch: refs/heads/master
Commit: e640f1e76af8f32015f475629610da127897f01e
Parents: 5b75fae
Author: Dima Spivak <ds...@cloudera.com>
Authored: Thu Jul 2 14:48:06 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 3 14:54:10 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/test/IntegrationTestReplication.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e640f1e7/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
index a56d5fe..c6668ad 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
@@ -63,6 +63,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
protected int generateVerifyGap;
protected Integer width;
protected Integer wrapMultiplier;
+ protected boolean noReplicationSetup = false;
private final String SOURCE_CLUSTER_OPT = "sourceCluster";
private final String DEST_CLUSTER_OPT = "destCluster";
@@ -70,6 +71,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
private final String NUM_MAPPERS_OPT = "numMappers";
private final String OUTPUT_DIR_OPT = "outputDir";
private final String NUM_REDUCERS_OPT = "numReducers";
+ private final String NO_REPLICATION_SETUP_OPT = "noReplicationSetup";
/**
* The gap (in seconds) from when data is finished being generated at the source
@@ -318,7 +320,9 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
source = new ClusterID(getConf(), sourceClusterIdString);
sink = new ClusterID(getConf(), sinkClusterIdString);
- setupTablesAndReplication();
+ if (!noReplicationSetup) {
+ setupTablesAndReplication();
+ }
int expectedNumNodes = 0;
for (int i = 0; i < numIterations; i++) {
LOG.info("Starting iteration = " + i);
@@ -348,11 +352,12 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
addRequiredOptWithArg("d", OUTPUT_DIR_OPT,
"Temporary directory where to write keys for the test");
-
addOptWithArg("nm", NUM_MAPPERS_OPT,
"Number of mappers (default: " + DEFAULT_NUM_MAPPERS + ")");
addOptWithArg("nr", NUM_REDUCERS_OPT,
"Number of reducers (default: " + DEFAULT_NUM_MAPPERS + ")");
+ addOptNoArg("nrs", NO_REPLICATION_SETUP_OPT,
+ "Don't setup tables or configure replication before starting test");
addOptWithArg("n", NUM_NODES_OPT,
"Number of nodes. This should be a multiple of width * wrapMultiplier." +
" (default: " + DEFAULT_NUM_NODES + ")");
@@ -396,6 +401,10 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
Integer.toString(DEFAULT_WRAP_MULTIPLIER)),
1, Integer.MAX_VALUE);
+ if (cmd.hasOption(NO_REPLICATION_SETUP_OPT)) {
+ noReplicationSetup = true;
+ }
+
if (numNodes % (width * wrapMultiplier) != 0) {
throw new RuntimeException("numNodes must be a multiple of width and wrap multiplier");
}
[2/5] hbase git commit: HBASE-14002 Add --noReplicationSetup option
to IntegrationTestReplication
Posted by ap...@apache.org.
HBASE-14002 Add --noReplicationSetup option to IntegrationTestReplication
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/67b61005
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/67b61005
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/67b61005
Branch: refs/heads/branch-1
Commit: 67b61005feb711e7355255a1fce5131846737bce
Parents: ab9a0b8
Author: Dima Spivak <ds...@cloudera.com>
Authored: Thu Jul 2 14:48:06 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 3 14:54:37 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/test/IntegrationTestReplication.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/67b61005/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
index a56d5fe..c6668ad 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
@@ -63,6 +63,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
protected int generateVerifyGap;
protected Integer width;
protected Integer wrapMultiplier;
+ protected boolean noReplicationSetup = false;
private final String SOURCE_CLUSTER_OPT = "sourceCluster";
private final String DEST_CLUSTER_OPT = "destCluster";
@@ -70,6 +71,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
private final String NUM_MAPPERS_OPT = "numMappers";
private final String OUTPUT_DIR_OPT = "outputDir";
private final String NUM_REDUCERS_OPT = "numReducers";
+ private final String NO_REPLICATION_SETUP_OPT = "noReplicationSetup";
/**
* The gap (in seconds) from when data is finished being generated at the source
@@ -318,7 +320,9 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
source = new ClusterID(getConf(), sourceClusterIdString);
sink = new ClusterID(getConf(), sinkClusterIdString);
- setupTablesAndReplication();
+ if (!noReplicationSetup) {
+ setupTablesAndReplication();
+ }
int expectedNumNodes = 0;
for (int i = 0; i < numIterations; i++) {
LOG.info("Starting iteration = " + i);
@@ -348,11 +352,12 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
addRequiredOptWithArg("d", OUTPUT_DIR_OPT,
"Temporary directory where to write keys for the test");
-
addOptWithArg("nm", NUM_MAPPERS_OPT,
"Number of mappers (default: " + DEFAULT_NUM_MAPPERS + ")");
addOptWithArg("nr", NUM_REDUCERS_OPT,
"Number of reducers (default: " + DEFAULT_NUM_MAPPERS + ")");
+ addOptNoArg("nrs", NO_REPLICATION_SETUP_OPT,
+ "Don't setup tables or configure replication before starting test");
addOptWithArg("n", NUM_NODES_OPT,
"Number of nodes. This should be a multiple of width * wrapMultiplier." +
" (default: " + DEFAULT_NUM_NODES + ")");
@@ -396,6 +401,10 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
Integer.toString(DEFAULT_WRAP_MULTIPLIER)),
1, Integer.MAX_VALUE);
+ if (cmd.hasOption(NO_REPLICATION_SETUP_OPT)) {
+ noReplicationSetup = true;
+ }
+
if (numNodes % (width * wrapMultiplier) != 0) {
throw new RuntimeException("numNodes must be a multiple of width and wrap multiplier");
}
[4/5] hbase git commit: HBASE-14002 Add --noReplicationSetup option
to IntegrationTestReplication
Posted by ap...@apache.org.
HBASE-14002 Add --noReplicationSetup option to IntegrationTestReplication
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8392861f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8392861f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8392861f
Branch: refs/heads/branch-1.1
Commit: 8392861f3f16c993b811a42faa384946698fbf14
Parents: 003ca96
Author: Dima Spivak <ds...@cloudera.com>
Authored: Thu Jul 2 14:48:06 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 3 14:54:43 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/test/IntegrationTestReplication.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8392861f/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
index a56d5fe..c6668ad 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
@@ -63,6 +63,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
protected int generateVerifyGap;
protected Integer width;
protected Integer wrapMultiplier;
+ protected boolean noReplicationSetup = false;
private final String SOURCE_CLUSTER_OPT = "sourceCluster";
private final String DEST_CLUSTER_OPT = "destCluster";
@@ -70,6 +71,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
private final String NUM_MAPPERS_OPT = "numMappers";
private final String OUTPUT_DIR_OPT = "outputDir";
private final String NUM_REDUCERS_OPT = "numReducers";
+ private final String NO_REPLICATION_SETUP_OPT = "noReplicationSetup";
/**
* The gap (in seconds) from when data is finished being generated at the source
@@ -318,7 +320,9 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
source = new ClusterID(getConf(), sourceClusterIdString);
sink = new ClusterID(getConf(), sinkClusterIdString);
- setupTablesAndReplication();
+ if (!noReplicationSetup) {
+ setupTablesAndReplication();
+ }
int expectedNumNodes = 0;
for (int i = 0; i < numIterations; i++) {
LOG.info("Starting iteration = " + i);
@@ -348,11 +352,12 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
addRequiredOptWithArg("d", OUTPUT_DIR_OPT,
"Temporary directory where to write keys for the test");
-
addOptWithArg("nm", NUM_MAPPERS_OPT,
"Number of mappers (default: " + DEFAULT_NUM_MAPPERS + ")");
addOptWithArg("nr", NUM_REDUCERS_OPT,
"Number of reducers (default: " + DEFAULT_NUM_MAPPERS + ")");
+ addOptNoArg("nrs", NO_REPLICATION_SETUP_OPT,
+ "Don't setup tables or configure replication before starting test");
addOptWithArg("n", NUM_NODES_OPT,
"Number of nodes. This should be a multiple of width * wrapMultiplier." +
" (default: " + DEFAULT_NUM_NODES + ")");
@@ -396,6 +401,10 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
Integer.toString(DEFAULT_WRAP_MULTIPLIER)),
1, Integer.MAX_VALUE);
+ if (cmd.hasOption(NO_REPLICATION_SETUP_OPT)) {
+ noReplicationSetup = true;
+ }
+
if (numNodes % (width * wrapMultiplier) != 0) {
throw new RuntimeException("numNodes must be a multiple of width and wrap multiplier");
}
[5/5] hbase git commit: HBASE-14002 Add --noReplicationSetup option
to IntegrationTestReplication
Posted by ap...@apache.org.
HBASE-14002 Add --noReplicationSetup option to IntegrationTestReplication
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/41306efd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/41306efd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/41306efd
Branch: refs/heads/0.98
Commit: 41306efd35249d0ae278f0b254e6033ff137c326
Parents: 9465a16
Author: Dima Spivak <ds...@cloudera.com>
Authored: Thu Jul 2 14:48:06 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 3 14:55:16 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/test/IntegrationTestReplication.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/41306efd/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
index 3f2c4b3..9287027 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
@@ -65,6 +65,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
protected int generateVerifyGap;
protected Integer width;
protected Integer wrapMultiplier;
+ protected boolean noReplicationSetup = false;
private final String SOURCE_CLUSTER_OPT = "sourceCluster";
private final String DEST_CLUSTER_OPT = "destCluster";
@@ -72,6 +73,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
private final String NUM_MAPPERS_OPT = "numMappers";
private final String OUTPUT_DIR_OPT = "outputDir";
private final String NUM_REDUCERS_OPT = "numReducers";
+ private final String NO_REPLICATION_SETUP_OPT = "noReplicationSetup";
/**
* The gap (in seconds) from when data is finished being generated at the source
@@ -323,7 +325,9 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
source = new ClusterID(getConf(), sourceClusterIdString);
sink = new ClusterID(getConf(), sinkClusterIdString);
- setupTablesAndReplication();
+ if (!noReplicationSetup) {
+ setupTablesAndReplication();
+ }
int expectedNumNodes = 0;
for (int i = 0; i < numIterations; i++) {
LOG.info("Starting iteration = " + i);
@@ -353,11 +357,12 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
addRequiredOptWithArg("d", OUTPUT_DIR_OPT,
"Temporary directory where to write keys for the test");
-
addOptWithArg("nm", NUM_MAPPERS_OPT,
"Number of mappers (default: " + DEFAULT_NUM_MAPPERS + ")");
addOptWithArg("nr", NUM_REDUCERS_OPT,
"Number of reducers (default: " + DEFAULT_NUM_MAPPERS + ")");
+ addOptNoArg("nrs", NO_REPLICATION_SETUP_OPT,
+ "Don't setup tables or configure replication before starting test");
addOptWithArg("n", NUM_NODES_OPT,
"Number of nodes. This should be a multiple of width * wrapMultiplier." +
" (default: " + DEFAULT_NUM_NODES + ")");
@@ -401,6 +406,10 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
Integer.toString(DEFAULT_WRAP_MULTIPLIER)),
1, Integer.MAX_VALUE);
+ if (cmd.hasOption(NO_REPLICATION_SETUP_OPT)) {
+ noReplicationSetup = true;
+ }
+
if (numNodes % (width * wrapMultiplier) != 0) {
throw new RuntimeException("numNodes must be a multiple of width and wrap multiplier");
}
[3/5] hbase git commit: HBASE-14002 Add --noReplicationSetup option
to IntegrationTestReplication
Posted by ap...@apache.org.
HBASE-14002 Add --noReplicationSetup option to IntegrationTestReplication
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/23d05e60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/23d05e60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/23d05e60
Branch: refs/heads/branch-1.2
Commit: 23d05e60ef017a1e17408a141fb2c3a21d054d62
Parents: 9daeebb
Author: Dima Spivak <ds...@cloudera.com>
Authored: Thu Jul 2 14:48:06 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 3 14:54:40 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/test/IntegrationTestReplication.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/23d05e60/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
index a56d5fe..c6668ad 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestReplication.java
@@ -63,6 +63,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
protected int generateVerifyGap;
protected Integer width;
protected Integer wrapMultiplier;
+ protected boolean noReplicationSetup = false;
private final String SOURCE_CLUSTER_OPT = "sourceCluster";
private final String DEST_CLUSTER_OPT = "destCluster";
@@ -70,6 +71,7 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
private final String NUM_MAPPERS_OPT = "numMappers";
private final String OUTPUT_DIR_OPT = "outputDir";
private final String NUM_REDUCERS_OPT = "numReducers";
+ private final String NO_REPLICATION_SETUP_OPT = "noReplicationSetup";
/**
* The gap (in seconds) from when data is finished being generated at the source
@@ -318,7 +320,9 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
source = new ClusterID(getConf(), sourceClusterIdString);
sink = new ClusterID(getConf(), sinkClusterIdString);
- setupTablesAndReplication();
+ if (!noReplicationSetup) {
+ setupTablesAndReplication();
+ }
int expectedNumNodes = 0;
for (int i = 0; i < numIterations; i++) {
LOG.info("Starting iteration = " + i);
@@ -348,11 +352,12 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
addRequiredOptWithArg("d", OUTPUT_DIR_OPT,
"Temporary directory where to write keys for the test");
-
addOptWithArg("nm", NUM_MAPPERS_OPT,
"Number of mappers (default: " + DEFAULT_NUM_MAPPERS + ")");
addOptWithArg("nr", NUM_REDUCERS_OPT,
"Number of reducers (default: " + DEFAULT_NUM_MAPPERS + ")");
+ addOptNoArg("nrs", NO_REPLICATION_SETUP_OPT,
+ "Don't setup tables or configure replication before starting test");
addOptWithArg("n", NUM_NODES_OPT,
"Number of nodes. This should be a multiple of width * wrapMultiplier." +
" (default: " + DEFAULT_NUM_NODES + ")");
@@ -396,6 +401,10 @@ public class IntegrationTestReplication extends IntegrationTestBigLinkedList {
Integer.toString(DEFAULT_WRAP_MULTIPLIER)),
1, Integer.MAX_VALUE);
+ if (cmd.hasOption(NO_REPLICATION_SETUP_OPT)) {
+ noReplicationSetup = true;
+ }
+
if (numNodes % (width * wrapMultiplier) != 0) {
throw new RuntimeException("numNodes must be a multiple of width and wrap multiplier");
}