From 58568a06f84fda155d613db61cb6e3826dcf83be Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 21 Jul 2014 15:03:08 -0700 Subject: [PATCH] HBASE-11557 Counter.class should always be added as dependencyJar --- .../java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java | 2 -- .../java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java index ae3b830..63efa90 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java @@ -154,8 +154,6 @@ public class TableMapReduceUtil { initTableMapJob(snapshotName, columns, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, TableSnapshotInputFormat.class); org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.resetCacheConfig(job); - // We would need even more libraries that hbase-server depends on - org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJars(job, Counter.class); } /** 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 fc7ccc3..b09a771 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 @@ -314,10 +314,7 @@ public class TableMapReduceUtil { TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir); initTableMapperJob(snapshotName, scan, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class); - resetCacheConfig(job.getConfiguration()); - // We would need even more libraries that hbase-server depends on - TableMapReduceUtil.addDependencyJars(job.getConfiguration(), Counter.class); } /** @@ -719,7 +716,8 @@ public class TableMapReduceUtil { org.jboss.netty.channel.ChannelFactory.class, com.google.protobuf.Message.class, com.google.common.collect.Lists.class, - org.cloudera.htrace.Trace.class); + org.cloudera.htrace.Trace.class, + org.cliffc.high_scale_lib.Counter.class); // needed for mapred over snapshots } /** -- 1.9.0