diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b584ec54af..a57171ad7e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -220,6 +220,9 @@ Release 2.6.0 - UNRELEASED YARN-2249. Avoided AM release requests being lost on work preserving RM restart. (Jian He via zjshen) + YARN-2034. Description for yarn.nodemanager.localizer.cache.target-size-mb + is incorrect (Chen He via jlowe) + Release 2.5.0 - UNRELEASED 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 39d1dd3b01..d227e4f415 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 @@ -606,7 +606,11 @@ public class YarnConfiguration extends Configuration { public static final long DEFAULT_NM_LOCALIZER_CACHE_CLEANUP_INTERVAL_MS = 10 * 60 * 1000; - /** Target size of localizer cache in MB, per local directory.*/ + /** + * Target size of localizer cache in MB, per nodemanager. It is a target + * retention size that only includes resources with PUBLIC and PRIVATE + * visibility and excludes resources with APPLICATION visibility + */ public static final String NM_LOCALIZER_CACHE_TARGET_SIZE_MB = NM_PREFIX + "localizer.cache.target-size-mb"; public static final long DEFAULT_NM_LOCALIZER_CACHE_TARGET_SIZE_MB = 10 * 1024; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 9b2b676492..55b3490a4e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -757,7 +757,10 @@ - Target size of localizer cache in MB, per local directory. + Target size of localizer cache in MB, per nodemanager. It is + a target retention size that only includes resources with PUBLIC and + PRIVATE visibility and excludes resources with APPLICATION visibility + yarn.nodemanager.localizer.cache.target-size-mb 10240