hbase git commit: HBASE-12864 IntegrationTestTableSnapshotInputFormat fails

[enis]

Repository: hbase
Updated Branches:
  refs/heads/0.98 cd1af4670 -> b5864b0e1


HBASE-12864 IntegrationTestTableSnapshotInputFormat fails

Conflicts:
        
hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b5864b0e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b5864b0e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b5864b0e

Branch: refs/heads/0.98
Commit: b5864b0e191ead3fe3d23b98fd769cf4b2a5634b
Parents: cd1af46
Author: Enis Soztutar <e...@apache.org>
Authored: Wed Jan 21 16:21:42 2015 -0800
Committer: Enis Soztutar <e...@apache.org>
Committed: Wed Jan 21 16:40:40 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b5864b0e/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 bfb978a..d602bed 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
@@ -63,8 +63,8 @@ import org.apache.hadoop.io.WritableComparable;
 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}
@@ -278,6 +278,7 @@ public class TableMapReduceUtil {
       HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 
HConstants.HFILE_BLOCK_CACHE_SIZE_DEFAULT);
     conf.setFloat("hbase.offheapcache.percentage", 0f);
     conf.setFloat("hbase.bucketcache.size", 0f);
+    conf.unset("hbase.bucketcache.ioengine");
   }
 
   /**
@@ -309,6 +310,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());
   }
 
@@ -374,7 +376,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) {