diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java index 1be8f01..1d66268 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java @@ -51,6 +51,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobClient; +import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.OutputCommitter; @@ -368,7 +369,7 @@ public class IntegrationTestImportTsv implements Configurable, Tool { TableMapReduceUtil.addDependencyJars(job); addTestDependencyJars(job.getConfiguration()); TableMapReduceUtil.initCredentials(job); - JobClient jc = new JobClient(job.getConfiguration()); + JobClient jc = new JobClient(new JobConf(job.getConfiguration())); job.getCredentials().addToken(new Text("my_mr_token"), jc.getDelegationToken(new Text("renewer"))); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java index 4d7cd5a..b273e3b 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.mapreduce; import static java.lang.String.format; -import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; @@ -425,7 +424,7 @@ public class ImportTsv extends Configured implements Tool { String columns[] = conf.getStrings(COLUMNS_CONF_KEY); if(StringUtils.isNotEmpty(conf.get(CREDENTIALS_LOCATION))) { String fileLoc = conf.get(CREDENTIALS_LOCATION); - Credentials cred = Credentials.readTokenStorageFile(new File(fileLoc), conf); + Credentials cred = Credentials.readTokenStorageFile(new Path(fileLoc), conf); job.getCredentials().addAll(cred); }