Repository: hbase Updated Branches: refs/heads/master e87a69d9c -> 735fe2002
HBASE-12864 IntegrationTestTableSnapshotInputFormat fails Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/735fe200 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/735fe200 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/735fe200 Branch: refs/heads/master Commit: 735fe2002995f8628a3c83ebbe8ee4a836a411bd Parents: e87a69d Author: Enis Soztutar <[email protected]> Authored: Wed Jan 21 16:21:42 2015 -0800 Committer: Enis Soztutar <[email protected]> Committed: Wed Jan 21 16:21:42 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/mapreduce/TableMapReduceUtil.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/735fe200/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 ab99e1a..3b303bd 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 @@ -52,24 +52,17 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.UserProvider; -import org.apache.hadoop.hbase.security.token.AuthenticationTokenIdentifier; -import org.apache.hadoop.hbase.security.token.AuthenticationTokenSelector; import org.apache.hadoop.hbase.security.token.TokenUtil; import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; -import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; -import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.StringUtils; -import org.apache.zookeeper.KeeperException; - import com.google.protobuf.InvalidProtocolBufferException; +import com.yammer.metrics.core.MetricsRegistry; /** * Utility for {@link TableMapper} and {@link TableReducer} @@ -311,7 +304,7 @@ public class TableMapReduceUtil { conf.setFloat( HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, HConstants.HFILE_BLOCK_CACHE_SIZE_DEFAULT); conf.setFloat(HConstants.BUCKET_CACHE_SIZE_KEY, 0f); - conf.setFloat("hbase.bucketcache.size", 0f); + conf.unset(HConstants.BUCKET_CACHE_IOENGINE_KEY); } /** @@ -343,6 +336,7 @@ 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()); } @@ -408,7 +402,7 @@ public class TableMapReduceUtil { Class<? extends TableMapper> mapper, Class<? extends WritableComparable> outputKeyClass, Class<? extends Writable> outputValueClass, Job job, - boolean addDependencyJars, + boolean addDependencyJars, boolean initCredentials) throws IOException { job.setInputFormatClass(MultiTableInputFormat.class); if (outputValueClass != null) {
