hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1494350 - in /hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase: HBaseTestingUtility.java mapreduce/TestImportExport.java
Date Tue, 18 Jun 2013 22:38:08 GMT
Author: stack
Date: Tue Jun 18 22:38:07 2013
New Revision: 1494350

URL: http://svn.apache.org/r1494350
Log:
HBASE-8453 TestImportExport failing again due to configuration issues -- REVERT

Modified:
    hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
    hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java

Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1494350&r1=1494349&r2=1494350&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
(original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Tue Jun 18 22:38:07 2013
@@ -2043,10 +2043,6 @@ public class HBaseTestingUtility extends
     return dfsCluster;
   }
 
-  public MiniMRCluster getMRCluster() {
-    return mrCluster;
-  }
-
   public void setDFSCluster(MiniDFSCluster cluster) throws IOException {
     if (dfsCluster != null && dfsCluster.isClusterUp()) {
       throw new IOException("DFSCluster is already running! Shut it down first.");

Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java?rev=1494350&r1=1494349&r2=1494350&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
(original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
Tue Jun 18 22:38:07 2013
@@ -26,7 +26,6 @@ import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
@@ -44,7 +43,6 @@ import org.apache.hadoop.hbase.filter.Pr
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.util.GenericOptionsParser;
-import org.apache.hadoop.mapred.JobConf;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -105,9 +103,7 @@ public class TestImportExport {
     GenericOptionsParser opts = new GenericOptionsParser(new Configuration(UTIL.getConfiguration()),
args);
     Configuration conf = opts.getConfiguration();
     args = opts.getRemainingArgs();
-    JobConf jobConf = UTIL.getMRCluster().createJobConf();
-    HBaseConfiguration.merge(jobConf, conf);
-    Job job = Export.createSubmittableJob(jobConf, args);
+    Job job = Export.createSubmittableJob(conf, args);
     job.waitForCompletion(false);
     return job.isSuccessful();
   }
@@ -125,9 +121,7 @@ public class TestImportExport {
     GenericOptionsParser opts = new GenericOptionsParser(new Configuration(UTIL.getConfiguration()),
args);
     Configuration conf = opts.getConfiguration();
     args = opts.getRemainingArgs();
-    JobConf jobConf = UTIL.getMRCluster().createJobConf();
-    HBaseConfiguration.merge(jobConf, conf);
-    Job job = Import.createSubmittableJob(jobConf, args);
+    Job job = Import.createSubmittableJob(conf, args);
     job.waitForCompletion(false);
     return job.isSuccessful();
   }
@@ -179,7 +173,7 @@ public class TestImportExport {
 
   /**
    * Test export .META. table
-   *
+   * 
    * @throws Exception
    */
   @Test



Mime
View raw message