From 3c72f54ef581b4f3e2eb84e1e24e459c38d3f769 Mon Sep 17 00:00:00 2001 From: Robert Kanter Date: Fri, 5 Dec 2014 12:07:01 -0800 Subject: [PATCH] YARN-2461. Fix PROCFS_USE_SMAPS_BASED_RSS_ENABLED property in YarnConfiguration. (rchiang via rkanter) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 252b7d54066..9804d61ccfd 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -189,6 +189,9 @@ Release 2.7.0 - UNRELEASED YARN-2874. Dead lock in "DelegationTokenRenewer" which blocks RM to execute any further apps. (Naganarasimha G R via kasha) + YARN-2461. Fix PROCFS_USE_SMAPS_BASED_RSS_ENABLED property in + YarnConfiguration. (rchiang via rkanter) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index f0f88d8d695..10ba832d54b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -819,7 +819,7 @@ public class YarnConfiguration extends Configuration { public static final String NM_CONTAINER_MON_PROCESS_TREE = NM_PREFIX + "container-monitor.process-tree.class"; public static final String PROCFS_USE_SMAPS_BASED_RSS_ENABLED = NM_PREFIX + - ".container-monitor.procfs-tree.smaps-based-rss.enabled"; + "container-monitor.procfs-tree.smaps-based-rss.enabled"; public static final boolean DEFAULT_PROCFS_USE_SMAPS_BASED_RSS_ENABLED = false;