You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by jl...@apache.org on 2014/02/28 22:35:26 UTC
svn commit: r1573087 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Author: jlowe
Date: Fri Feb 28 21:35:25 2014
New Revision: 1573087
URL: http://svn.apache.org/r1573087
Log:
svn merge -c 1565478 FIXES: MAPREDUCE-5744. Job hangs because RMContainerAllocator$AssignedRequests.preemptReduce() violates the comparator contract. Contributed by Gera Shegalov
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1573087&r1=1573086&r2=1573087&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri Feb 28 21:35:25 2014
@@ -24,6 +24,10 @@ Release 0.23.11 - UNRELEASED
MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList
(jlowe)
+ MAPREDUCE-5744. Job hangs because
+ RMContainerAllocator$AssignedRequests.preemptReduce() violates the
+ comparator contract (Gera Shegalov via kasha)
+
Release 0.23.10 - 2013-12-09
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1573087&r1=1573086&r2=1573087&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java Fri Feb 28 21:35:25 2014
@@ -1046,9 +1046,9 @@ public class RMContainerAllocator extend
new Comparator<TaskAttemptId>() {
@Override
public int compare(TaskAttemptId o1, TaskAttemptId o2) {
- float p = getJob().getTask(o1.getTaskId()).getAttempt(o1).getProgress() -
- getJob().getTask(o2.getTaskId()).getAttempt(o2).getProgress();
- return p >= 0 ? 1 : -1;
+ return Float.compare(
+ getJob().getTask(o1.getTaskId()).getAttempt(o1).getProgress(),
+ getJob().getTask(o2.getTaskId()).getAttempt(o2).getProgress());
}
});