From b61f52ec565b84306ec8d9e0b53f5d0390e1b597 Mon Sep 17 00:00:00 2001 From: Brahma Reddy Battula Date: Tue, 30 Mar 2021 09:51:47 +0530 Subject: [PATCH] YARN-10441. Add support for hadoop.http.rmwebapp.scheduler.page.class. Contributed by D M Murali Krishna Reddy --- .../org/apache/hadoop/yarn/conf/YarnConfiguration.java | 10 ++++++++++ .../hadoop/yarn/conf/TestYarnConfigurationFields.java | 3 +++ 2 files changed, 13 insertions(+) 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 1888ffb64c..2cf4a3bccb 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 @@ -120,6 +120,8 @@ private static void addDeprecatedKeys() { CommonConfigurationKeys.ZK_TIMEOUT_MS), new DeprecationDelta(RM_ZK_RETRY_INTERVAL_MS, CommonConfigurationKeys.ZK_RETRY_INTERVAL_MS), + new DeprecationDelta(HADOOP_HTTP_WEBAPP_SCHEDULER_PAGE, + YARN_HTTP_WEBAPP_SCHEDULER_PAGE) }); Configuration.addDeprecations(new DeprecationDelta[] { new DeprecationDelta("yarn.resourcemanager.display.per-user-apps", @@ -2487,6 +2489,14 @@ public static boolean isAclEnabled(Configuration conf) { public static final String YARN_HTTP_WEBAPP_EXTERNAL_CLASSES = "yarn.http.rmwebapp.external.classes"; + /** + * @deprecated This field is deprecated for + * {@link #YARN_HTTP_WEBAPP_SCHEDULER_PAGE} + */ + @Deprecated + public static final String HADOOP_HTTP_WEBAPP_SCHEDULER_PAGE = + "hadoop.http.rmwebapp.scheduler.page.class"; + public static final String YARN_HTTP_WEBAPP_SCHEDULER_PAGE = "yarn.http.rmwebapp.scheduler.page.class"; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java index 9fda8094c9..3dcd5cc3be 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java @@ -157,6 +157,9 @@ public void initializeMemberVariables() { configurationPropsToSkipCompare .add(YarnConfiguration.DEFAULT_RM_RESOURCE_PROFILES_SOURCE_FILE); + configurationPropsToSkipCompare + .add(YarnConfiguration.HADOOP_HTTP_WEBAPP_SCHEDULER_PAGE); + // Ignore NodeManager "work in progress" variables configurationPrefixToSkipCompare .add(YarnConfiguration.NM_NETWORK_RESOURCE_ENABLED);