Repository: hadoop Updated Branches: refs/heads/branch-2 2c782fdb1 -> 007d6d1d5
YARN-4778. Support specifying resources for task containers in SLS. Contributed by Wangda Tan (cherry picked from commit 996a210ab0131606639ba87fd5daab14bf05b35f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/007d6d1d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/007d6d1d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/007d6d1d Branch: refs/heads/branch-2 Commit: 007d6d1d57c19fd1880c9fac321095c023d869af Parents: 2c782fd Author: Jian He <[email protected]> Authored: Mon May 9 14:49:10 2016 -0700 Committer: Jian He <[email protected]> Committed: Mon May 9 14:50:00 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/sls/SLSRunner.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/007d6d1d/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java index 3064656..6bee74d 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/SLSRunner.java @@ -61,6 +61,7 @@ import org.apache.hadoop.yarn.sls.scheduler.ContainerSimulator; import org.apache.hadoop.yarn.sls.scheduler.ResourceSchedulerWrapper; import org.apache.hadoop.yarn.sls.scheduler.TaskRunner; import org.apache.hadoop.yarn.sls.utils.SLSUtils; +import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.log4j.Logger; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.map.ObjectMapper; @@ -302,10 +303,25 @@ public class SLSRunner { long taskFinish = Long.parseLong( jsonTask.get("container.end.ms").toString()); long lifeTime = taskFinish - taskStart; + + // Set memory and vcores from job trace file + Resource res = Resources.clone(containerResource); + if (jsonTask.containsKey("container.memory")) { + int containerMemory = Integer.parseInt( + jsonTask.get("container.memory").toString()); + res.setMemory(containerMemory); + } + + if (jsonTask.containsKey("container.vcores")) { + int containerVCores = Integer.parseInt( + jsonTask.get("container.vcores").toString()); + res.setVirtualCores(containerVCores); + } + int priority = Integer.parseInt( jsonTask.get("container.priority").toString()); String type = jsonTask.get("container.type").toString(); - containerList.add(new ContainerSimulator(containerResource, + containerList.add(new ContainerSimulator(res, lifeTime, hostname, priority, type)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
