From 62da795ddbd69fb65da028367abacaef565a7f8e Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Thu, 30 Apr 2015 15:43:59 -0700 Subject: [PATCH] HBASE-13604 bin/hbase mapredcp does not include yammer-metrics jar --- .../apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 c3466f3c1a4..7d793ab27bb 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 @@ -61,7 +61,6 @@ import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.StringUtils; import com.google.protobuf.InvalidProtocolBufferException; -import com.yammer.metrics.core.MetricsRegistry; /** * Utility for {@link TableMapper} and {@link TableReducer} @@ -335,7 +334,6 @@ public class TableMapReduceUtil { TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir); initTableMapperJob(snapshotName, scan, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class); - addDependencyJars(job.getConfiguration(), MetricsRegistry.class); resetCacheConfig(job.getConfiguration()); } @@ -728,7 +726,8 @@ public class TableMapReduceUtil { io.netty.channel.Channel.class, com.google.protobuf.Message.class, com.google.common.collect.Lists.class, - org.apache.htrace.Trace.class); + org.apache.htrace.Trace.class, + com.yammer.metrics.core.MetricsRegistry.class); } /**