Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1454481) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -38,8 +38,10 @@ 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; @@ -1555,6 +1557,25 @@ } } + /* + * Copies Configuration entries which are absent in dst from src to dst + * @param src source Configuration + * @param dst destination Configuration + * @return destination Configuration + */ + private Configuration copyNewConfEntries(Configuration src, Configuration dst) { + if (src == null || src.size() == 0) return dst; + Iterator> iter = src.iterator(); + while (iter.hasNext()) { + Entry entry = iter.next(); + if (dst.get(entry.getKey()) == null) { + LOG.debug("copying " + entry.getKey() + " = " + entry.getValue()); + dst.set(entry.getKey(), entry.getValue()); + } + } + return dst; + } + /** * Starts a MiniMRCluster. Call {@link #setFileSystemURI(String)} to use a different * filesystem. @@ -1579,6 +1600,7 @@ if (jobConf == null) { jobConf = mrCluster.createJobConf(); } + copyNewConfEntries(jobConf, this.conf); jobConf.set("mapred.local.dir", conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not LOG.info("Mini mapreduce cluster started"); Index: pom.xml =================================================================== --- pom.xml (revision 1454481) +++ pom.xml (working copy) @@ -865,7 +865,7 @@ 1.6 ${project.version} - 2.0.2-alpha + 2.0.4-SNAPSHOT 1.1.1 1.2 1.7