You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/03/20 01:20:18 UTC
svn commit: r1458586 - in /hbase/branches/0.95:
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Author: enis
Date: Wed Mar 20 00:20:17 2013
New Revision: 1458586
URL: http://svn.apache.org/r1458586
Log:
HBASE-8146 IntegrationTestBigLinkedList does not work on distributed setup
Modified:
hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Modified: hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java?rev=1458586&r1=1458585&r2=1458586&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java (original)
+++ hbase/branches/0.95/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java Wed Mar 20 00:20:17 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/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1458586&r1=1458585&r2=1458586&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Wed Mar 20 00:20:17 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(),