Reverting Changes to do rack resolutions in the RM and in the AM (ddas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1135875 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -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)

mapreduce/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java

@@ -51,7 +51,6 @@ import org.apache.hadoop.yarn.api.records.ContainerId;
 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 extends RMContainerRequestor
     maxReducePreemptionLimit = conf.getFloat(
         AMConstants.REDUCE_PREEMPTION_LIMIT,
         AMConstants.DEFAULT_REDUCE_PREEMPTION_LIMIT);
-    RackResolver.init(conf);
   }
 
   @Override
@@ -618,7 +616,8 @@ public class RMContainerAllocator extends RMContainerRequestor
           }
         }
         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();