Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8146 IntegrationTestBigLinkedList does not work on distributed setup 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1458585 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2013-03-20 00:19:02 +00:00
parent d5b03c3648
commit 1a4f478909
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
View File

@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory;
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 IntegrationTestBigLinkedList extends Configured implements Tool {
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 IntegrationTestBigLinkedList extends Configured implements Tool {
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 IntegrationTestBigLinkedList extends Configured implements Tool {
}
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);
}
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
View File

@ -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(),