You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by bo...@apache.org on 2012/07/17 21:15:31 UTC
svn commit: r1362613 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
Author: bobby
Date: Tue Jul 17 19:15:30 2012
New Revision: 1362613
URL: http://svn.apache.org/viewvc?rev=1362613&view=rev
Log:
svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1362613&r1=1362612&r2=1362613&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue Jul 17 19:15:30 2012
@@ -106,6 +106,9 @@ Release 2.1.0-alpha - Unreleased
MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager
#determineTimestamps (Bhallamudi via bobby)
+ MAPREDUCE-4380. Empty Userlogs directory is getting created under logs
+ directory (Devaraj K via bobby)
+
Release 2.0.0-alpha - 05-23-2012
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java?rev=1362613&r1=1362612&r2=1362613&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java Tue Jul 17 19:15:30 2012
@@ -66,14 +66,6 @@ public class TaskLog {
// localFS is set in (and used by) writeToIndexFile()
static LocalFileSystem localFS = null;
- static {
- if (!LOG_DIR.exists()) {
- boolean b = LOG_DIR.mkdirs();
- if (!b) {
- LOG.debug("mkdirs failed. Ignoring.");
- }
- }
- }
public static String getMRv2LogDir() {
return System.getProperty(MRJobConfig.TASK_LOG_DIR);
@@ -638,6 +630,12 @@ public class TaskLog {
* @return base log directory
*/
static File getUserLogDir() {
+ if (!LOG_DIR.exists()) {
+ boolean b = LOG_DIR.mkdirs();
+ if (!b) {
+ LOG.debug("mkdirs failed. Ignoring.");
+ }
+ }
return LOG_DIR;
}