Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13604 bin/hbase mapredcp does not include yammer-metrics jar

This commit is contained in:
Nick Dimiduk 2015-04-30 15:43:59 -07:00
parent 1d26d26407
commit 9925e6df39
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
View File

@ -61,7 +61,6 @@ import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import com.yammer.metrics.core.MetricsRegistry;
/** /**
* Utility for {@link TableMapper} and {@link TableReducer} * Utility for {@link TableMapper} and {@link TableReducer}
@ -335,7 +334,6 @@ public class TableMapReduceUtil {
TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir); TableSnapshotInputFormat.setInput(job, snapshotName, tmpRestoreDir);
initTableMapperJob(snapshotName, scan, mapper, outputKeyClass, initTableMapperJob(snapshotName, scan, mapper, outputKeyClass,
outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class); outputValueClass, job, addDependencyJars, false, TableSnapshotInputFormat.class);
addDependencyJars(job.getConfiguration(), MetricsRegistry.class);
resetCacheConfig(job.getConfiguration()); resetCacheConfig(job.getConfiguration());
} }
@ -728,7 +726,8 @@ public class TableMapReduceUtil {
io.netty.channel.Channel.class, io.netty.channel.Channel.class,
com.google.protobuf.Message.class, com.google.protobuf.Message.class,
com.google.common.collect.Lists.class, com.google.common.collect.Lists.class,
org.apache.htrace.Trace.class); org.apache.htrace.Trace.class,
com.yammer.metrics.core.MetricsRegistry.class);
} }
/** /**