Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 68479 invoked from network); 4 Mar 2011 04:47:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:47:01 -0000 Received: (qmail 15673 invoked by uid 500); 4 Mar 2011 04:47:01 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 15642 invoked by uid 500); 4 Mar 2011 04:47:01 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 15634 invoked by uid 99); 4 Mar 2011 04:47:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:47:01 +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; Fri, 04 Mar 2011 04:47:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 045A623888CD; Fri, 4 Mar 2011 04:46:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077707 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java Date: Fri, 04 Mar 2011 04:46:40 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304044641.045A623888CD@eris.apache.org> Author: omalley Date: Fri Mar 4 04:46:40 2011 New Revision: 1077707 URL: http://svn.apache.org/viewvc?rev=1077707&view=rev Log: commit ea4f0a651b2f854be7769f88c932c4119fb9b7dd Author: Devaraj Das Date: Sun Sep 19 17:24:16 2010 -0700 Fixing a bug in the deletion of logs when they exceed the size Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java?rev=1077707&r1=1077706&r2=1077707&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JvmManager.java Fri Mar 4 04:46:40 2011 @@ -191,7 +191,8 @@ class JvmManager { " exceeded the allowed " + "log limits " + logdir); String user = firstTask.getUser(); - String jobLogDir = firstTask.getJobID().toString() + logdir.getName(); + String jobLogDir = firstTask.getJobID().toString() + + Path.SEPARATOR + logdir.getName(); PathDeletionContext item = new TaskController.DeletionContext(tracker.getTaskController(), true, user, jobLogDir);