hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1132918 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
Date Tue, 07 Jun 2011 09:04:12 GMT
Author: sharad
Date: Tue Jun  7 09:04:12 2011
New Revision: 1132918

URL: http://svn.apache.org/viewvc?rev=1132918&view=rev
Log:
Cleanup redundant code in TaskAttemptImpl.

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/job/impl/TaskAttemptImpl.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1132918&r1=1132917&r2=1132918&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue Jun  7 09:04:12 2011
@@ -4,6 +4,7 @@ Trunk (unreleased changes)
 
 
     MAPREDUCE-279
+    Cleanup redundant code in TaskAttemptImpl. (sharad)
 
     Disable aggregation of logs onto DFS till JobHistoryServer starts
     serving logs. (vinodkv)

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.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/job/impl/TaskAttemptImpl.java?rev=1132918&r1=1132917&r2=1132918&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
(original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
Tue Jun  7 09:04:12 2011
@@ -424,10 +424,6 @@ public abstract class TaskAttemptImpl im
   }
 
   private int getMemoryRequired(Configuration conf, TaskType taskType) {
-    //TODO: get this from RM instead of reading the config
-    int slotMemSize = conf.getInt("yarn.capacity-scheduler.minimum-allocation-mb",
-        1024);
-    LOG.info("slotMemSize " + slotMemSize);
     int memory = 1024;
     if (taskType == TaskType.MAP)  {
       memory = conf.getInt(MRJobConfig.MAP_MEMORY_MB, 1024);
@@ -435,8 +431,6 @@ public abstract class TaskAttemptImpl im
       memory = conf.getInt(MRJobConfig.REDUCE_MEMORY_MB, 1024);
     }
     
-    //round off on slotsize
-    memory = (int) Math.ceil((float) memory/slotMemSize) * slotMemSize;
     return memory;
   }
 



Mime
View raw message