YARN-3740. Fixed the typo in the configuration name: APPLICATION_HIST…

…ORY_PREFIX_MAX_APPS. Contributed by Xuan Gong.
apache · May 30, 2015 · eb6bf91 · eb6bf91
1 parent 374ddd9
commit eb6bf91
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
@@ -470,6 +470,9 @@ Release 2.8.0 - UNRELEASED
     YARN-3716. Node-label-expression should be included by 
     ResourceRequestPBImpl.toString. (Xianyin Xin via wangda)
 
+    YARN-3740. Fixed the typo in the configuration name:
+    APPLICATION_HISTORY_PREFIX_MAX_APPS. (Xuan Gong via zjshen)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

diff --git a/...oop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/...oop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -1476,9 +1476,9 @@ private static void addDeprecatedKeys() {
    * REST API or application history protocol and shown in timeline
    * server web ui.
    */
-  public static final String APPLICATION_HISTORY_PREFIX_MAX_APPS =
+  public static final String APPLICATION_HISTORY_MAX_APPS =
       APPLICATION_HISTORY_PREFIX + "max-applications";
-  public static final long DEFAULT_APPLICATION_HISTORY_PREFIX_MAX_APPS = 10000;
+  public static final long DEFAULT_APPLICATION_HISTORY_MAX_APPS = 10000;
 
   /** Timeline service store class */
   public static final String TIMELINE_SERVICE_STORE =

diff --git a/...adoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java b/...adoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java
@@ -94,8 +94,8 @@ protected void serviceInit(Configuration conf) throws Exception {
     serverHttpAddress = WebAppUtils.getHttpSchemePrefix(conf) +
         WebAppUtils.getAHSWebAppURLWithoutScheme(conf);
     maxLoadedApplications =
-        conf.getLong(YarnConfiguration.APPLICATION_HISTORY_PREFIX_MAX_APPS,
-          YarnConfiguration.DEFAULT_APPLICATION_HISTORY_PREFIX_MAX_APPS);
+        conf.getLong(YarnConfiguration.APPLICATION_HISTORY_MAX_APPS,
+          YarnConfiguration.DEFAULT_APPLICATION_HISTORY_MAX_APPS);
     super.serviceInit(conf);
   }
 

diff --git a/...che/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java b/...che/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
@@ -108,7 +108,7 @@ public void testApplications() throws IOException, YarnException {
     // Create a historyManager, and set the max_apps can be loaded
     // as 1.
     Configuration conf = new YarnConfiguration();
-    conf.setLong(YarnConfiguration.APPLICATION_HISTORY_PREFIX_MAX_APPS, 1);
+    conf.setLong(YarnConfiguration.APPLICATION_HISTORY_MAX_APPS, 1);
     ApplicationHistoryManagerOnTimelineStore historyManager2 =
         new ApplicationHistoryManagerOnTimelineStore(dataManager,
           new ApplicationACLsManager(conf));