YARN-2461. Fix PROCFS_USE_SMAPS_BASED_RSS_ENABLED property in YarnConfiguration. (rchiang via rkanter)

(cherry picked from commit 3c72f54ef5)
This commit is contained in:
Robert Kanter 2014-12-05 12:07:01 -08:00
parent b8e4fffa49
commit 2ebd1bc654
2 changed files with 4 additions and 1 deletions

View File

@ -159,6 +159,9 @@ Release 2.7.0 - UNRELEASED
YARN-2874. Dead lock in "DelegationTokenRenewer" which blocks RM to execute YARN-2874. Dead lock in "DelegationTokenRenewer" which blocks RM to execute
any further apps. (Naganarasimha G R via kasha) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -819,7 +819,7 @@ public class YarnConfiguration extends Configuration {
public static final String NM_CONTAINER_MON_PROCESS_TREE = public static final String NM_CONTAINER_MON_PROCESS_TREE =
NM_PREFIX + "container-monitor.process-tree.class"; NM_PREFIX + "container-monitor.process-tree.class";
public static final String PROCFS_USE_SMAPS_BASED_RSS_ENABLED = NM_PREFIX + 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 = public static final boolean DEFAULT_PROCFS_USE_SMAPS_BASED_RSS_ENABLED =
false; false;