Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1526688 FIXES: MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526702 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2013-09-26 21:21:34 +00:00
parent d2e94731ee
commit 2b7ae8dd5d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-mapreduce-project/CHANGES.txt
View File

@ -90,6 +90,9 @@ Release 2.1.2 - UNRELEASED
MAPREDUCE-5525. Increase timeout of TestDFSIO.testAppend and
TestMRJobsWithHistoryService.testJobHistoryData. (Chuan Liu via cnauroth)
MAPREDUCE-5513. ConcurrentModificationException in JobControl (Robert
Parker via jlowe)
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
@ -1284,6 +1287,9 @@ Release 0.23.10 - UNRELEASED
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta
via tgraves)
MAPREDUCE-5513. ConcurrentModificationException in JobControl (Robert
Parker via jlowe)
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES

8
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
View File

@ -77,13 +77,11 @@ public class JobControl implements Runnable {
this.runnerState = ThreadState.READY;
}
private static List<ControlledJob> toList(
synchronized private static List<ControlledJob> toList(
LinkedList<ControlledJob> jobs) {
ArrayList<ControlledJob> retv = new ArrayList<ControlledJob>();
synchronized (jobs) {
for (ControlledJob job : jobs) {
retv.add(job);
}
for (ControlledJob job : jobs) {
retv.add(job);
}
return retv;
}