hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1458585 - in /hbase/trunk: hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Date Wed, 20 Mar 2013 00:19:02 GMT
Author: enis
Date: Wed Mar 20 00:19:02 2013
New Revision: 1458585

URL: http://svn.apache.org/r1458585
Log:
HBASE-8146 IntegrationTestBigLinkedList does not work on distributed setup

Modified:
    hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java

Modified: hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1458585&r1=1458584&r2=1458585&view=diff
==============================================================================
--- hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
(original)
+++ hbase/trunk/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
Wed Mar 20 00:19:02 2013
@@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.IntegrationTestingUtility;
@@ -149,7 +150,7 @@ public class IntegrationTestBigLinkedLis
 
   private static final String TABLE_NAME_KEY = "IntegrationTestBigLinkedList.table";
 
-  private static final String DEFAULT_TABLE_NAME = "ci";
+  private static final String DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedList";
 
   private static byte[] FAMILY_NAME = Bytes.toBytes("meta");
 
@@ -466,6 +467,8 @@ public class IntegrationTestBigLinkedLis
       job.setOutputFormatClass(NullOutputFormat.class);
 
       job.getConfiguration().setBoolean("mapred.map.tasks.speculative.execution", false);
+      TableMapReduceUtil.addDependencyJars(job);
+      TableMapReduceUtil.initCredentials(job);
 
       boolean success = job.waitForCompletion(true);
 
@@ -992,7 +995,7 @@ public class IntegrationTestBigLinkedLis
   }
 
   public static void main(String[] args) throws Exception {
-    int ret = ToolRunner.run(new IntegrationTestBigLinkedList(), args);
+    int ret = ToolRunner.run(HBaseConfiguration.create(), new IntegrationTestBigLinkedList(),
args);
     System.exit(ret);
   }
 }
\ No newline at end of file

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1458585&r1=1458584&r2=1458585&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Wed Mar 20 00:19:02 2013
@@ -226,7 +226,7 @@ public class TableMapReduceUtil {
       initTableMapperJob(table, scan, mapper, outputKeyClass,
               outputValueClass, job, addDependencyJars, TableInputFormat.class);
   }
-  
+
   /**
    * Use this before submitting a Multi TableMap job. It will appropriately set
    * up the job.
@@ -523,6 +523,8 @@ public class TableMapReduceUtil {
           // pull necessary dependencies
           org.apache.zookeeper.ZooKeeper.class,
           com.google.protobuf.Message.class,
+          com.google.common.collect.Lists.class,
+          org.cloudera.htrace.Trace.class,
           // pull job classes
           job.getMapOutputKeyClass(),
           job.getMapOutputValueClass(),



Mime
View raw message