Repository: incubator-myriad Updated Branches: refs/heads/master 700dd44ac -> 63b58698e
Update cgroups documentation - was missing a necessary yarn-site configuration. Fix minor typo hierachy->hierarchy. Pull Request: Closes #65 Author: Darin Johnson <dar...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/63b58698 Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/63b58698 Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/63b58698 Branch: refs/heads/master Commit: 63b58698e668729f9f5fb65d5ebc426bf6a8680e Parents: 700dd44 Author: darinj <dar...@apache.org> Authored: Sat May 21 14:37:28 2016 -0400 Committer: darinj <dar...@apache.org> Committed: Sun May 22 22:44:17 2016 -0400 ---------------------------------------------------------------------- docs/cgroups.md | 4 ++++ .../java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/63b58698/docs/cgroups.md ---------------------------------------------------------------------- diff --git a/docs/cgroups.md b/docs/cgroups.md index d28eeab..b90c781 100644 --- a/docs/cgroups.md +++ b/docs/cgroups.md @@ -82,6 +82,10 @@ Modify the `$YARN_HOME/etc/hadoop/yarn-site.xml` file by adding the following co <name>yarn.nodemanager.linux-container-executor.path</name> <value>${yarn.home}/bin/container-executor</value> </property> +<property> +<name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name> +<value>${yarn.nodemanager.linux-container-executor.cgroups.hierarchy}</value> +</property> <!-- Optional parameters, usually unnecessary <property> http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/63b58698/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java index 8fca9e2..18c3fce 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java @@ -41,7 +41,7 @@ public class NMExecutorCLGenImpl implements ExecutorCommandLineGenerator { * YARN class to help handle LCE resources */ // TODO (mohit): Should it be configurable ? - public static final String KEY_YARN_NM_LCE_CGROUPS_HIERARCHY = "yarn.nodemanager.linux-container-executor.cgroups.hierachy"; + public static final String KEY_YARN_NM_LCE_CGROUPS_HIERARCHY = "yarn.nodemanager.linux-container-executor.cgroups.hierarchy"; public static final String KEY_YARN_HOME = "yarn.home"; public static final String KEY_NM_RESOURCE_CPU_VCORES = "nodemanager.resource.cpu-vcores"; public static final String KEY_NM_RESOURCE_MEM_MB = "nodemanager.resource.memory-mb";
