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 dd...@apache.org on 2009/02/13 06:47:55 UTC

svn commit: r744000 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobHistory.java

Author: ddas
Date: Fri Feb 13 05:47:55 2009
New Revision: 744000

URL: http://svn.apache.org/viewvc?rev=744000&view=rev
Log:
HADOOP-4933. Fixes a ConcurrentModificationException problem that shows up when the history viewer is accessed concurrently. Contributed by Amar Kamat.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobHistory.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=744000&r1=743999&r2=744000&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Feb 13 05:47:55 2009
@@ -168,6 +168,10 @@
     HADOOP-5172. Disable misbehaving Chukwa unit test until it can be fixed.
     (Jerome Boulon via nigel)
 
+    HADOOP-4933. Fixes a ConcurrentModificationException problem that shows up
+    when the history viewer is accessed concurrently. 
+    (Amar Kamat via ddas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobHistory.java?rev=744000&r1=743999&r2=744000&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobHistory.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobHistory.java Fri Feb 13 05:47:55 2009
@@ -126,9 +126,6 @@
     SUCCESS, FAILED, KILLED, MAP, REDUCE, CLEANUP, RUNNING, PREP, SETUP
   }
 
-  // temp buffer for parsed dataa
-  private static Map<Keys,String> parseBuffer = new HashMap<Keys, String>(); 
-
   /**
    * Initialize JobHistory files. 
    * @param conf Jobconf of the job tracker.
@@ -294,6 +291,7 @@
     String data = line.substring(idx+1, line.length());
     
     Matcher matcher = pattern.matcher(data); 
+    Map<Keys,String> parseBuffer = new HashMap<Keys, String>();
 
     while(matcher.find()){
       String tuple = matcher.group(0);