Author: arp Date: Wed Oct 16 21:12:17 2013 New Revision: 1532913 URL: http://svn.apache.org/r1532913 Log: Merging r1532877 through r1532910 from trunk to branch HDFS-2832
Modified: hadoop/common/branches/HDFS-2832/ (props changed) hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java Propchange: hadoop/common/branches/HDFS-2832/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1532877-1532910 Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java?rev=1532913&r1=1532912&r2=1532913&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java (original) +++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java Wed Oct 16 21:12:17 2013 @@ -75,6 +75,7 @@ public class TestCopyMapper { Configuration configuration = new Configuration(); System.setProperty("test.build.data", "target/tmp/build/TEST_COPY_MAPPER/data"); configuration.set("hadoop.log.dir", "target/tmp"); + configuration.set("dfs.namenode.fs-limits.min-block-size", "0"); LOG.debug("fs.default.name == " + configuration.get("fs.default.name")); LOG.debug("dfs.http.address == " + configuration.get("dfs.http.address")); return configuration; Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java?rev=1532913&r1=1532912&r2=1532913&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java (original) +++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java Wed Oct 16 21:12:17 2013 @@ -122,11 +122,9 @@ public class DebugJobProducer implements // Add/remove excess recs[0] += totalrecs - tot_recs; bytes[0] += totalbytes - tot_bytes; - if (LOG.isInfoEnabled()) { - LOG.info( - "DIST: " + Arrays.toString(recs) + " " + tot_recs + "/" + totalrecs + - " " + Arrays.toString(bytes) + " " + tot_bytes + "/" + totalbytes); - } + LOG.info( + "DIST: " + Arrays.toString(recs) + " " + tot_recs + "/" + totalrecs + + " " + Arrays.toString(bytes) + " " + tot_bytes + "/" + totalbytes); } private static final AtomicInteger seq = new AtomicInteger(0);