Repository: hbase Updated Branches: refs/heads/master 175f133db -> 45bc13d87
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/45bc13d8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/45bc13d8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/45bc13d8 Branch: refs/heads/master Commit: 45bc13d87a08dd56c01a20e3b574f85882500810 Parents: 175f133 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 09:12:53 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/45bc13d8/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 5153474..03bc4f0 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 @@ -391,7 +391,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) {
