hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajeshb...@apache.org
Subject hbase git commit: HBASE-13940 IntegrationTestBulkLoad needs option to specify output folders used by test(Rajeshbabu)
Date Tue, 23 Jun 2015 19:35:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 3e72dc9f0 -> 168c1b1b7


HBASE-13940 IntegrationTestBulkLoad needs option to specify output folders used by test(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 168c1b1b739ae8e557f824325ce5b8a2b9a82e15
Parents: 3e72dc9
Author: Rajeshbabu Chintaguntla <rajeshbabu@apache.org>
Authored: Wed Jun 24 01:06:55 2015 +0530
Committer: Rajeshbabu Chintaguntla <rajeshbabu@apache.org>
Committed: Wed Jun 24 01:06:55 2015 +0530

----------------------------------------------------------------------
 .../hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/168c1b1b/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 2d686c5..b5f0360 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
@@ -253,7 +253,12 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
     String jobName =  IntegrationTestBulkLoad.class.getSimpleName() + " - " +
         EnvironmentEdgeManager.currentTime();
     Configuration conf = new Configuration(util.getConfiguration());
-    Path p = util.getDataTestDirOnTestFS(getTablename() +  "-" + iteration);
+    Path p = null;
+    if (conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY) == null) {
+      p = util.getDataTestDirOnTestFS(getTablename() + "-" + iteration);
+    } else {
+      p = new Path(conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY));
+    }
 
     conf.setBoolean("mapreduce.map.speculative", false);
     conf.setBoolean("mapreduce.reduce.speculative", false);


Mime
View raw message