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 dd...@apache.org on 2011/05/24 04:14:26 UTC
svn commit: r1126823 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt
mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Author: ddas
Date: Tue May 24 02:14:26 2011
New Revision: 1126823
URL: http://svn.apache.org/viewvc?rev=1126823&view=rev
Log:
Fix for regression on the scheduling of reduces before maps are done. Contributed by Devaraj Das.
Modified:
hadoop/mapreduce/branches/MR-279/CHANGES.txt
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1126823&r1=1126822&r2=1126823&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue May 24 02:14:26 2011
@@ -4,6 +4,8 @@ Trunk (unreleased changes)
MAPREDUCE-279
+ Fix for regression on the scheduling of reduces before maps are done (ddas)
+
Fix NPE in test case (mahadev)
Use DefaultContainerExecutor for integration tests. (cdouglas)
Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1126823&r1=1126822&r2=1126823&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java Tue May 24 02:14:26 2011
@@ -237,6 +237,7 @@ public class RMContainerAllocator extend
assigned = maps.remove(tId);
mapsAssigned++;
LOG.info("Assigned from earlierFailedMaps");
+ break;
}
}
@@ -248,6 +249,7 @@ public class RMContainerAllocator extend
assigned = reduces.remove(tId);
reducesAssigned++;
LOG.info("Assigned from earlierFailedReduces");
+ break;
}
}
@@ -269,6 +271,7 @@ public class RMContainerAllocator extend
mapsAssigned++;
hostLocalAssigned++;
LOG.info("Assigned based on host match " + host);
+ break;
}
}
if (assigned == null) {
@@ -282,6 +285,7 @@ public class RMContainerAllocator extend
mapsAssigned++;
rackLocalAssigned++;
LOG.info("Assigned based on rack match " + rack);
+ break;
}
}
if (assigned == null && maps.size() > 0) {
@@ -289,6 +293,7 @@ public class RMContainerAllocator extend
assigned = maps.remove(tId);
mapsAssigned++;
LOG.info("Assigned based on * match");
+ break;
}
}
}