Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 90457 invoked from network); 4 Mar 2011 03:27:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 03:27:23 -0000 Received: (qmail 1500 invoked by uid 500); 4 Mar 2011 03:27:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 1408 invoked by uid 500); 4 Mar 2011 03:27:22 -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 1399 invoked by uid 99); 4 Mar 2011 03:27:22 -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 03:27:22 +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 03:27:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 995B02388B3A; Fri, 4 Mar 2011 03:27:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076971 - in /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred: JobHistory.java JobTracker.java Date: Fri, 04 Mar 2011 03:27:01 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304032701.995B02388B3A@eris.apache.org> Author: omalley Date: Fri Mar 4 03:27:01 2011 New Revision: 1076971 URL: http://svn.apache.org/viewvc?rev=1076971&view=rev Log: commit 25e0347cbc64d2e2238bb457e963f108272873f5 Author: Yahoo\! Date: Thu Aug 13 09:38:53 2009 -0700 Applying patch 2935902.mr817delta.patch Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=1076971&r1=1076970&r2=1076971&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobHistory.java Fri Mar 4 03:27:01 2011 @@ -197,6 +197,9 @@ public class JobHistory { } void moveToDone(final JobID id) { + if (disableHistory) { + return; + } final List paths = new ArrayList(); final Path historyFile = fileManager.getHistoryFile(id); if (historyFile == null) { Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1076971&r1=1076970&r2=1076971&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobTracker.java Fri Mar 4 03:27:01 2011 @@ -519,15 +519,19 @@ public class JobTracker implements MRCon } } synchronized (userToJobsMap) { - for (Map.Entry> entry : - userToJobsMap.entrySet()) { - String user = entry.getKey(); + Iterator>> + userToJobsMapIt = userToJobsMap.entrySet().iterator(); + while (userToJobsMapIt.hasNext()) { + Map.Entry> entry = + userToJobsMapIt.next(); ArrayList userJobs = entry.getValue(); Iterator it = userJobs.iterator(); while (it.hasNext() && userJobs.size() > MAX_COMPLETE_USER_JOBS_IN_MEMORY) { JobInProgress jobUser = it.next(); if (retiredJobs.contains(jobUser)) { + LOG.info("Removing from userToJobsMap: " + + jobUser.getJobID()); it.remove(); } else if (minConditionToRetire(jobUser, now)) { LOG.info("User limit exceeded. Marking job: " + @@ -537,7 +541,7 @@ public class JobTracker implements MRCon } } if (userJobs.isEmpty()) { - userToJobsMap.remove(user); + userToJobsMapIt.remove(); } } }