Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -c 1494035 from trunk to branch-2 to fix YARN-799. Fix CgroupsLCEResourcesHandler to use /tasks instead of /cgroup.procs. Contributed by Chris Riccomini. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494036 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2013-06-18 06:36:14 +00:00
parent af90aa5265
commit 63779058cb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -643,6 +643,9 @@ Release 2.1.0-beta - UNRELEASED
YARN-795. Fair scheduler queue metrics should subtract allocated vCores from YARN-795. Fair scheduler queue metrics should subtract allocated vCores from
available vCores. (ywskycn via tucu) available vCores. (ywskycn via tucu)
YARN-799. Fix CgroupsLCEResourcesHandler to use /tasks instead of
/cgroup.procs. (Chris Riccomini via acmurthy)
Release 2.0.5-alpha - 06/06/2013 Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/CgroupsLCEResourcesHandler.java
View File

@ -222,7 +222,7 @@ public class CgroupsLCEResourcesHandler implements LCEResourcesHandler {
StringBuilder sb = new StringBuilder("cgroups="); StringBuilder sb = new StringBuilder("cgroups=");
if (isCpuWeightEnabled()) { if (isCpuWeightEnabled()) {
sb.append(pathForCgroup(CONTROLLER_CPU, containerName) + "/cgroup.procs"); sb.append(pathForCgroup(CONTROLLER_CPU, containerName) + "/tasks");
sb.append(","); sb.append(",");
} }