Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71F889A55 for ; Tue, 17 Jul 2012 19:14:54 +0000 (UTC) Received: (qmail 76163 invoked by uid 500); 17 Jul 2012 19:14:54 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 76107 invoked by uid 500); 17 Jul 2012 19:14:54 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 76099 invoked by uid 99); 17 Jul 2012 19:14:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 19:14:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jul 2012 19:14:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1703D23888E4; Tue, 17 Jul 2012 19:14:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1362612 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java Date: Tue, 17 Jul 2012 19:14:33 -0000 To: mapreduce-commits@hadoop.apache.org From: bobby@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120717191434.1703D23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bobby Date: Tue Jul 17 19:14:33 2012 New Revision: 1362612 URL: http://svn.apache.org/viewvc?rev=1362612&view=rev Log: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby) Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1362612&r1=1362611&r2=1362612&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Jul 17 19:14:33 2012 @@ -254,6 +254,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/trunk/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/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java?rev=1362612&r1=1362611&r2=1362612&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java Tue Jul 17 19:14:33 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; }