From 63779058cbef00df80fa5f93c915bc8c1fb5a284 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 18 Jun 2013 06:36:14 +0000 Subject: [PATCH] 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 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/nodemanager/util/CgroupsLCEResourcesHandler.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9775032bfa6..530d98325cc 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -643,6 +643,9 @@ Release 2.1.0-beta - UNRELEASED YARN-795. Fair scheduler queue metrics should subtract allocated vCores from 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 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/CgroupsLCEResourcesHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/CgroupsLCEResourcesHandler.java index f83defb1680..3a44afee0ad 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/CgroupsLCEResourcesHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/util/CgroupsLCEResourcesHandler.java @@ -222,7 +222,7 @@ public String getResourcesOption(ContainerId containerId) { StringBuilder sb = new StringBuilder("cgroups="); if (isCpuWeightEnabled()) { - sb.append(pathForCgroup(CONTROLLER_CPU, containerName) + "/cgroup.procs"); + sb.append(pathForCgroup(CONTROLLER_CPU, containerName) + "/tasks"); sb.append(","); }