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 2013/04/30 00:17:13 UTC

svn commit: r1477379 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java

Author: apurtell
Date: Mon Apr 29 22:17:12 2013
New Revision: 1477379

URL: http://svn.apache.org/r1477379
Log:
HBASE-8454. TestImportTsv failing due to configuration issues

Modified:
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java?rev=1477379&r1=1477378&r2=1477379&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java Mon Apr 29 22:17:12 2013
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.Path;
@@ -289,7 +290,10 @@ public class TestImportTsv {
         LOG.info("set the hbaseAdmin");
         ImportTsv.createHbaseAdmin(conf);
       }
-      Job job = ImportTsv.createSubmittableJob(conf, args);
+
+      JobConf jobConf = htu1.getMRCluster().createJobConf();
+      HBaseConfiguration.merge(jobConf, conf);
+      Job job = ImportTsv.createSubmittableJob(jobConf, args);
       job.waitForCompletion(false);
       assertTrue(job.isSuccessful());