hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1135875 - in /hadoop/common/branches/MR-279/mapreduce: CHANGES.txt mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Date Wed, 15 Jun 2011 00:42:36 GMT
Author: mahadev
Date: Wed Jun 15 00:42:36 2011
New Revision: 1135875

URL: http://svn.apache.org/viewvc?rev=1135875&view=rev
Log:
Reverting Changes to do rack resolutions in the RM and in the AM (ddas)

Modified:
    hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
    hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1135875&r1=1135874&r2=1135875&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Wed Jun 15 00:42:36 2011
@@ -5,11 +5,10 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
+
     MAPREDUCE-2569. Ensure root queue allocated 100% capacity. (Jonathan
     Eagles via cdouglas)
 
-    Changes to do rack resolutions in the RM and in the AM (ddas)
-
     Fix NPE in history event handling (siddharth seth via mahadev)
 
     Job level node blacklisting. (sharad)

Modified: hadoop/common/branches/MR-279/mapreduce/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/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java?rev=1135875&r1=1135874&r2=1135875&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
(original)
+++ hadoop/common/branches/MR-279/mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
Wed Jun 15 00:42:36 2011
@@ -51,7 +51,6 @@ import org.apache.hadoop.yarn.api.record
 import org.apache.hadoop.yarn.api.records.ContainerState;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.util.RackResolver;
 
 /**
  * Allocates the container from the ResourceManager scheduler.
@@ -137,7 +136,6 @@ public class RMContainerAllocator extend
     maxReducePreemptionLimit = conf.getFloat(
         AMConstants.REDUCE_PREEMPTION_LIMIT,
         AMConstants.DEFAULT_REDUCE_PREEMPTION_LIMIT);
-    RackResolver.init(conf);
   }
 
   @Override
@@ -618,7 +616,8 @@ public class RMContainerAllocator extend
           }
         }
         if (assigned == null) {
-          String rack = RackResolver.resolve(host).getNetworkLocation();
+          // TODO: get rack
+          String rack = "";
           list = mapsRackMapping.get(rack);
           while (list != null && list.size() > 0) {
             TaskAttemptId tId = list.removeFirst();



Mime
View raw message