Repository: hbase Updated Branches: refs/heads/0.98 174b59ff8 -> 23cd02a21
HBASE-11378 TableMapReduceUtil overwrites user supplied options for multiple tables/scaners job Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/23cd02a2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/23cd02a2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/23cd02a2 Branch: refs/heads/0.98 Commit: 23cd02a21cae7b98b12178cd04fb2e88aa56b4a2 Parents: 174b59f Author: Jimmy Xiang <jxi...@cloudera.com> Authored: Thu Jun 19 09:12:53 2014 -0700 Committer: Jimmy Xiang <jxi...@cloudera.com> Committed: Thu Jun 19 10:46:09 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/23cd02a2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index eb90482..fc7ccc3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -392,7 +392,8 @@ public class TableMapReduceUtil { job.setMapOutputKeyClass(outputKeyClass); } job.setMapperClass(mapper); - HBaseConfiguration.addHbaseResources(job.getConfiguration()); + Configuration conf = job.getConfiguration(); + HBaseConfiguration.merge(conf, HBaseConfiguration.create(conf)); List<String> scanStrings = new ArrayList<String>(); for (Scan scan : scans) {
