HBASE-7904 Make mapreduce jobs pass based on 2.0.4-alpha

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1462686 13f79535-47bb-0310-9956-ffa450edef68

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -484,7 +484,7 @@ public class HRegion implements HeapSize { // , Writable{
       this.rsAccounting = this.rsServices.getRegionServerAccounting();
       // don't initialize coprocessors if not running within a regionserver
       // TODO: revisit if coprocessors should load in other cases
-      this.coprocessorHost = new RegionCoprocessorHost(this, rsServices, conf);
+      this.coprocessorHost = new RegionCoprocessorHost(this, rsServices, baseConf);
       this.metricsRegionWrapper = new MetricsRegionWrapperImpl(this);
       this.metricsRegion = new MetricsRegion(this.metricsRegionWrapper);
     } else {

hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java

@@ -1,5 +1,3 @@
-
-
 /**
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -38,8 +36,10 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NavigableSet;
 import java.util.Random;
 import java.util.Set;
@@ -1656,6 +1656,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
     if (jobConf == null) {
       jobConf = mrCluster.createJobConf();
     }
+    HBaseConfiguration.merge(this.conf, jobConf);
     jobConf.set("mapred.local.dir",
       conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not
     LOG.info("Mini mapreduce cluster started");

hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java

@@ -228,8 +228,11 @@ public class TestImportExport {
         OUTPUT_DIR
     };
  
-    GenericOptionsParser opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args);
+    GenericOptionsParser opts = new GenericOptionsParser(new Configuration(
+      cluster.getConfiguration()), args);
     Configuration conf = opts.getConfiguration();
+    // copy or add the necessary configuration values from the map reduce config to the hbase config
+    copyConfigurationValues(UTIL.getConfiguration(), conf);
     args = opts.getRemainingArgs();
     assertEquals(conf.get(Export.EXPORT_BATCHING), EXPORT_BATCH_SIZE);
 
@@ -350,6 +353,8 @@ public class TestImportExport {
     GenericOptionsParser opts = new GenericOptionsParser(new Configuration(
         cluster.getConfiguration()), args);
     Configuration conf = opts.getConfiguration();
+    // copy or add the necessary configuration values from the map reduce config to the hbase config
+    copyConfigurationValues(UTIL.getConfiguration(), conf);
     args = opts.getRemainingArgs();
 
     Job job = Export.createSubmittableJob(conf, args);
@@ -369,6 +374,8 @@ public class TestImportExport {
 
     opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args);
     conf = opts.getConfiguration();
+    // copy or add the necessary configuration values from the map reduce config to the hbase config
+    copyConfigurationValues(UTIL.getConfiguration(), conf);
     args = opts.getRemainingArgs();
 
     job = Import.createSubmittableJob(conf, args);
@@ -392,6 +399,8 @@ public class TestImportExport {
 
     opts = new GenericOptionsParser(new Configuration(cluster.getConfiguration()), args);
     conf = opts.getConfiguration();
+    // copy or add the necessary configuration values from the map reduce config to the hbase config
+    copyConfigurationValues(UTIL.getConfiguration(), conf);
     args = opts.getRemainingArgs();
 
     job = Import.createSubmittableJob(conf, args);

pom.xml

@@ -732,7 +732,7 @@
     <buildDate>${maven.build.timestamp}</buildDate>
     <compileSource>1.6</compileSource>
     <!-- Dependencies -->
-    <hadoop-two.version>2.0.2-alpha</hadoop-two.version>
+    <hadoop-two.version>2.0.4-SNAPSHOT</hadoop-two.version>
     <hadoop-one.version>1.1.2</hadoop-one.version>
     <commons-cli.version>1.2</commons-cli.version>
     <commons-codec.version>1.7</commons-codec.version>