You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ss...@apache.org on 2013/06/03 04:35:35 UTC

svn commit: r1488829 - /hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java

Author: sseth
Date: Mon Jun  3 02:35:34 2013
New Revision: 1488829

URL: http://svn.apache.org/r1488829
Log:
YARN-720 and MAPREDUCE-5291. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.

Modified:
    hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java

Modified: hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java?rev=1488829&r1=1488828&r2=1488829&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/TestStreamingTaskLog.java Mon Jun  3 02:35:34 2013
@@ -155,8 +155,8 @@ public class TestStreamingTaskLog {
     String env = MapReduceTestUtil.readOutput(outputPath, mr.createJobConf());
     long logSize = USERLOG_LIMIT_KB * 1024;
     assertTrue("environment set for child is wrong", env.contains("INFO,CLA")
-               && env.contains("-Dyarn.app.mapreduce.container.log.dir=")
-               && env.contains("-Dyarn.app.mapreduce.container.log.filesize=" + logSize)
+               && env.contains("-Dyarn.app.container.log.dir=")
+               && env.contains("-Dyarn.app.container.log.filesize=" + logSize)
                && env.contains("-Dlog4j.configuration="));
   }
 }