You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2014/02/23 03:05:29 UTC
svn commit: r1570949 - in
/hadoop/common/branches/branch-2/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/
hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/
hadoop-yarn/h...
Author: vinodkv
Date: Sun Feb 23 02:05:28 2014
New Revision: 1570949
URL: http://svn.apache.org/r1570949
Log:
YARN-1749. Updated application-history related configs to reflect the latest reality and to be consistently named. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1570948 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Sun Feb 23 02:05:28 2014
@@ -209,6 +209,9 @@ Release 2.4.0 - UNRELEASED
YARN-1687. Renamed user-facing records for the timeline-service to be simply
named after 'timeline' instead of 'apptimeline'. (Zhijie Shen via vinodkv)
+ YARN-1749. Updated application-history related configs to reflect the latest
+ reality and to be consistently named. (Zhijie Shen via vinodkv)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java Sun Feb 23 02:05:28 2014
@@ -300,11 +300,6 @@ public class YarnConfiguration extends C
public static final int DEFAULT_RM_HISTORY_WRITER_MULTI_THREADED_DISPATCHER_POOL_SIZE =
10;
- /** The implementation class of ApplicationHistoryStore, which is to be used
- * by RMApplicationHistoryWriter. */
- public static final String RM_HISTORY_WRITER_CLASS = RM_PREFIX
- + "history-writer.class";
-
//Delegation token related keys
public static final String DELEGATION_KEY_UPDATE_INTERVAL_KEY =
RM_PREFIX + "delegation.key.update-interval";
@@ -994,68 +989,83 @@ public class YarnConfiguration extends C
YARN_PREFIX + "app.container.log.backups";
////////////////////////////////
- // AHS Configs
+ // Timeline Service Configs
////////////////////////////////
- public static final String AHS_PREFIX = YARN_PREFIX + "ahs.";
-
- /** The setting that controls whether history-service is enabled or not.. */
- public static final String YARN_HISTORY_SERVICE_ENABLED = AHS_PREFIX
- + "enabled";
- public static final boolean DEFAULT_YARN_HISTORY_SERVICE_ENABLED = false;
+ public static final String TIMELINE_SERVICE_PREFIX =
+ YARN_PREFIX + "timeline-service.";
- /** URI for FileSystemApplicationHistoryStore */
- public static final String FS_HISTORY_STORE_URI = AHS_PREFIX + "fs-history-store.uri";
- /** T-file compression types used to compress history data.*/
- public static final String FS_HISTORY_STORE_COMPRESSION_TYPE = AHS_PREFIX + "fs-history-store.compression-type";
- public static final String DEFAULT_FS_HISTORY_STORE_COMPRESSION_TYPE = "none";
-
- /** AHS store class */
- public static final String AHS_STORE = AHS_PREFIX + "store.class";
+ // mark app-history related configs @Private as application history is going
+ // to be integrated into the timeline service
+ @Private
+ public static final String APPLICATION_HISTORY_PREFIX =
+ TIMELINE_SERVICE_PREFIX + "generic-application-history.";
- /** host:port address for Application History Server API. */
- public static final String AHS_ADDRESS = AHS_PREFIX + "address";
- public static final int DEFAULT_AHS_PORT = 10200;
- public static final String DEFAULT_AHS_ADDRESS = "0.0.0.0:"
- + DEFAULT_AHS_PORT;
-
- /** The number of threads to handle client API requests. */
- public static final String AHS_CLIENT_THREAD_COUNT = AHS_PREFIX
- + "client.thread-count";
- public static final int DEFAULT_AHS_CLIENT_THREAD_COUNT = 10;
-
-
- /** The address of the AHS web application.*/
- public static final String AHS_WEBAPP_ADDRESS = AHS_PREFIX
- + "webapp.address";
-
- public static final int DEFAULT_AHS_WEBAPP_PORT = 8188;
- public static final String DEFAULT_AHS_WEBAPP_ADDRESS = "0.0.0.0:"
- + DEFAULT_AHS_WEBAPP_PORT;
+ /**
+ * The setting that controls whether application history service is
+ * enabled or not.
+ */
+ @Private
+ public static final String APPLICATION_HISTORY_ENABLED =
+ APPLICATION_HISTORY_PREFIX + "enabled";
+ @Private
+ public static final boolean DEFAULT_APPLICATION_HISTORY_ENABLED = false;
- /** The https address of the AHS web application.*/
- public static final String AHS_WEBAPP_HTTPS_ADDRESS = AHS_PREFIX
- + "webapp.https.address";
+ /** Application history store class */
+ @Private
+ public static final String APPLICATION_HISTORY_STORE =
+ APPLICATION_HISTORY_PREFIX + "store-class";
- public static final int DEFAULT_AHS_WEBAPP_HTTPS_PORT = 8190;
- public static final String DEFAULT_AHS_WEBAPP_HTTPS_ADDRESS = "0.0.0.0:"
- + DEFAULT_AHS_WEBAPP_HTTPS_PORT;
-
- /**The kerberos principal to be used for spnego filter for AHS.*/
- public static final String AHS_WEBAPP_SPNEGO_USER_NAME_KEY =
- AHS_PREFIX + "webapp.spnego-principal";
-
- /**The kerberos keytab to be used for spnego filter for AHS.*/
- public static final String AHS_WEBAPP_SPNEGO_KEYTAB_FILE_KEY =
- AHS_PREFIX + "webapp.spnego-keytab-file";
+ /** URI for FileSystemApplicationHistoryStore */
+ @Private
+ public static final String FS_APPLICATION_HISTORY_STORE_URI =
+ APPLICATION_HISTORY_PREFIX + "fs-history-store.uri";
- ////////////////////////////////
- // Timeline Service Configs
- ////////////////////////////////
+ /** T-file compression types used to compress history data.*/
+ @Private
+ public static final String FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE =
+ APPLICATION_HISTORY_PREFIX + "fs-history-store.compression-type";
+ @Private
+ public static final String DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE =
+ "none";
- public static final String TIMELINE_SERVICE_PREFIX =
- YARN_PREFIX + "timeline-service.";
+ /** host:port address for timeline service RPC APIs. */
+ public static final String TIMELINE_SERVICE_ADDRESS =
+ TIMELINE_SERVICE_PREFIX + "address";
+ public static final int DEFAULT_TIMELINE_SERVICE_PORT = 10200;
+ public static final String DEFAULT_TIMELINE_SERVICE_ADDRESS = "0.0.0.0:"
+ + DEFAULT_TIMELINE_SERVICE_PORT;
+
+ /** The number of threads to handle client RPC API requests. */
+ public static final String TIMELINE_SERVICE_HANDLER_THREAD_COUNT =
+ TIMELINE_SERVICE_PREFIX + "handler-thread-count";
+ public static final int DEFAULT_TIMELINE_SERVICE_CLIENT_THREAD_COUNT = 10;
+
+
+ /** The address of the timeline service web application.*/
+ public static final String TIMELINE_SERVICE_WEBAPP_ADDRESS =
+ TIMELINE_SERVICE_PREFIX + "webapp.address";
+
+ public static final int DEFAULT_TIMELINE_SERVICE_WEBAPP_PORT = 8188;
+ public static final String DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS =
+ "0.0.0.0:" + DEFAULT_TIMELINE_SERVICE_WEBAPP_PORT;
+
+ /** The https address of the timeline service web application.*/
+ public static final String TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS =
+ TIMELINE_SERVICE_PREFIX + "webapp.https.address";
+
+ public static final int DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_PORT = 8190;
+ public static final String DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS =
+ "0.0.0.0:" + DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_PORT;
+
+ /**The kerberos principal to be used for spnego filter for timeline service.*/
+ public static final String TIMELINE_SERVICE_WEBAPP_SPNEGO_USER_NAME_KEY =
+ TIMELINE_SERVICE_PREFIX + "webapp.spnego-principal";
+
+ /**The kerberos keytab to be used for spnego filter for timeline service.*/
+ public static final String TIMELINE_SERVICE_WEBAPP_SPNEGO_KEYTAB_FILE_KEY =
+ TIMELINE_SERVICE_PREFIX + "webapp.spnego-keytab-file";
/** Timeline service store class */
public static final String TIMELINE_SERVICE_STORE =
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AHSClientImpl.java Sun Feb 23 02:05:28 2014
@@ -63,9 +63,9 @@ public class AHSClientImpl extends AHSCl
}
private static InetSocketAddress getAHSAddress(Configuration conf) {
- return conf.getSocketAddr(YarnConfiguration.AHS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_PORT);
+ return conf.getSocketAddr(YarnConfiguration.TIMELINE_SERVICE_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_PORT);
}
@Override
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java Sun Feb 23 02:05:28 2014
@@ -67,13 +67,13 @@ public class TimelineClientImpl extends
if (YarnConfiguration.useHttps(conf)) {
resURI = URI
.create(JOINER.join("https://", conf.get(
- YarnConfiguration.AHS_WEBAPP_HTTPS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_WEBAPP_HTTPS_ADDRESS),
+ YarnConfiguration.TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS),
RESOURCE_URI_STR));
} else {
resURI = URI.create(JOINER.join("http://", conf.get(
- YarnConfiguration.AHS_WEBAPP_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_WEBAPP_ADDRESS), RESOURCE_URI_STR));
+ YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS), RESOURCE_URI_STR));
}
super.serviceInit(conf);
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/YarnClientImpl.java Sun Feb 23 02:05:28 2014
@@ -114,8 +114,8 @@ public class YarnClientImpl extends Yarn
YarnConfiguration.DEFAULT_YARN_CLIENT_APPLICATION_CLIENT_PROTOCOL_POLL_INTERVAL_MS);
}
- if (conf.getBoolean(YarnConfiguration.YARN_HISTORY_SERVICE_ENABLED,
- YarnConfiguration.DEFAULT_YARN_HISTORY_SERVICE_ENABLED)) {
+ if (conf.getBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED,
+ YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED)) {
historyServiceEnabled = true;
historyClient = AHSClientImpl.createAHSClient();
historyClient.init(getConfig());
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java Sun Feb 23 02:05:28 2014
@@ -142,11 +142,11 @@ public class WebAppUtils {
public static String getAHSWebAppURLWithoutScheme(Configuration conf) {
if (YarnConfiguration.useHttps(conf)) {
- return conf.get(YarnConfiguration.AHS_WEBAPP_HTTPS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_WEBAPP_HTTPS_ADDRESS);
+ return conf.get(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_HTTPS_ADDRESS);
} else {
- return conf.get(YarnConfiguration.AHS_WEBAPP_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_WEBAPP_ADDRESS);
+ return conf.get(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_WEBAPP_ADDRESS);
}
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml Sun Feb 23 02:05:28 2014
@@ -573,30 +573,12 @@
</property>
<property>
- <description>Indicate to ResourceManager as well as clients whether
- history-service is enabled or not. If enabled, ResourceManager starts
- recording historical data that ApplicationHistory service can consume.
- Similarly, clients can redirect to the history service when applications
- finish if this is enabled.</description>
- <name>yarn.ahs.enabled</name>
- <value>false</value>
- </property>
-
- <property>
<description>Number of worker threads that write the history data.</description>
<name>yarn.resourcemanager.history-writer.multi-threaded-dispatcher.pool-size</name>
<value>10</value>
</property>
<property>
- <description>The implementation class of ApplicationHistoryStore, which is
- to be used by RMApplicationHistoryWriter.
- </description>
- <name>yarn.resourcemanager.history-writer.class</name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore</value>
- </property>
-
- <property>
<description>The class to use as the configuration provider.
If org.apache.hadoop.yarn.LocalConfigurationProvider is used,
the local configuration will be loaded.
@@ -1085,73 +1067,81 @@
<value></value>
</property>
- <!-- Application History Service's Configuration-->
+ <!-- Timeline Service's Configuration-->
<property>
- <description>The hostname of the AHS.</description>
- <name>yarn.ahs.hostname</name>
+ <description>The hostname of the timeline service web application.</description>
+ <name>yarn.timeline-service.hostname</name>
<value>0.0.0.0</value>
</property>
<property>
- <description>The http address of the AHS web application.</description>
- <name>yarn.ahs.webapp.address</name>
- <value>${yarn.ahs.hostname}:8188</value>
+ <description>This is default address for the timeline server to start the
+ RPC server.</description>
+ <name>yarn.timeline-service.address</name>
+ <value>0.0.0.0:10200</value>
</property>
<property>
- <description>The https adddress of the AHS web application.</description>
- <name>yarn.ahs.webapp.https.address</name>
- <value>${yarn.ahs.hostname}:8190</value>
+ <description>The http address of the timeline service web application.</description>
+ <name>yarn.timeline-service.webapp.address</name>
+ <value>${yarn.timeline-service.hostname}:8188</value>
</property>
<property>
- <description>URI pointing to the location of the FileSystem path where
- the history will be persisted. This must be supplied when using
- org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
- as the value for yarn.resourcemanager.history-writer.store.class</description>
- <name>yarn.ahs.fs-history-store.uri</name>
- <value>${hadoop.log.dir}/yarn/system/ahstore</value>
+ <description>The https adddress of the timeline service web application.</description>
+ <name>yarn.timeline-service.webapp.https.address</name>
+ <value>${yarn.timeline-service.hostname}:8190</value>
</property>
<property>
- <description>This is default address for the Application History server
- to start the RPC server.</description>
- <name>yarn.ahs.address</name>
- <value>0.0.0.0:10200</value>
+ <description>Store class name for timeline store</description>
+ <name>yarn.timeline-service.store-class</name>
+ <value>org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore</value>
</property>
<property>
- <description>CLient thread count to serve the client requests.</description>
- <name>yarn.ahs.client.thread-count</name>
- <value>10</value>
+ <description>Store file name for leveldb timeline store</description>
+ <name>yarn.timeline-service.leveldb-timeline-store.path</name>
+ <value>${yarn.log.dir}/timeline</value>
</property>
-
+
<property>
- <description>T-file compression types used to compress history data.</description>
- <name>yarn.ahs.fs-history-store.compression-type</name>
- <value>none</value>
+ <description>Handler thread count to serve the client RPC requests.</description>
+ <name>yarn.timeline-service.handler-thread-count</name>
+ <value>10</value>
</property>
-
+
<property>
- <description> Store class name for history store, defaulting to file
- system store </description>
- <name>yarn.ahs.store.class</name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore</value>
+ <description>Indicate to ResourceManager as well as clients whether
+ history-service is enabled or not. If enabled, ResourceManager starts
+ recording historical data that ApplicationHistory service can consume.
+ Similarly, clients can redirect to the history service when applications
+ finish if this is enabled.</description>
+ <name>yarn.timeline-service.generic-application-history.enabled</name>
+ <value>false</value>
</property>
- <!-- Timeline Service's Configuration-->
-
<property>
- <description>Store class name for timeline store</description>
- <name>yarn.timeline-service.store-class</name>
- <value>org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbTimelineStore</value>
+ <description>URI pointing to the location of the FileSystem path where
+ the history will be persisted. This must be supplied when using
+ org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore
+ as the value for yarn.timeline-service.generic-application-history.store-class</description>
+ <name>yarn.timeline-service.generic-application-history.fs-history-store.uri</name>
+ <value>${hadoop.log.dir}/yarn/system/history</value>
</property>
<property>
- <description>Store file name for leveldb timeline store</description>
- <name>yarn.timeline-service.leveldb-timeline-store.path</name>
- <value>${yarn.log.dir}/timeline</value>
+ <description>T-file compression types used to compress history data.</description>
+ <name>yarn.timeline-service.generic-application-history.fs-history-store.compression-type</name>
+ <value>none</value>
+ </property>
+
+ <property>
+ <description>Store class name for history store, defaulting to file
+ system store </description>
+ <name>yarn.timeline-service.generic-application-history.store-class</name>
+ <value>org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore</value>
</property>
<!-- Other configuration -->
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryClientService.java Sun Feb 23 02:05:28 2014
@@ -76,19 +76,19 @@ public class ApplicationHistoryClientSer
Configuration conf = getConfig();
YarnRPC rpc = YarnRPC.create(conf);
InetSocketAddress address =
- conf.getSocketAddr(YarnConfiguration.AHS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_ADDRESS,
- YarnConfiguration.DEFAULT_AHS_PORT);
+ conf.getSocketAddr(YarnConfiguration.TIMELINE_SERVICE_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_ADDRESS,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_PORT);
server =
rpc.getServer(ApplicationHistoryProtocol.class, protocolHandler,
address, conf, null, conf.getInt(
- YarnConfiguration.AHS_CLIENT_THREAD_COUNT,
- YarnConfiguration.DEFAULT_AHS_CLIENT_THREAD_COUNT));
+ YarnConfiguration.TIMELINE_SERVICE_HANDLER_THREAD_COUNT,
+ YarnConfiguration.DEFAULT_TIMELINE_SERVICE_CLIENT_THREAD_COUNT));
server.start();
this.bindAddress =
- conf.updateConnectAddr(YarnConfiguration.AHS_ADDRESS,
+ conf.updateConnectAddr(YarnConfiguration.TIMELINE_SERVICE_ADDRESS,
server.getListenerAddress());
LOG.info("Instantiated ApplicationHistoryClientService at "
+ this.bindAddress);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java Sun Feb 23 02:05:28 2014
@@ -79,7 +79,8 @@ public class ApplicationHistoryManagerIm
protected ApplicationHistoryStore createApplicationHistoryStore(
Configuration conf) {
return ReflectionUtils.newInstance(conf.getClass(
- YarnConfiguration.AHS_STORE, FileSystemApplicationHistoryStore.class,
+ YarnConfiguration.APPLICATION_HISTORY_STORE,
+ FileSystemApplicationHistoryStore.class,
ApplicationHistoryStore.class), conf);
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java Sun Feb 23 02:05:28 2014
@@ -158,9 +158,9 @@ public class ApplicationHistoryServer ex
ahsClientService, "ws")
.with(getConfig())
.withHttpSpnegoPrincipalKey(
- YarnConfiguration.AHS_WEBAPP_SPNEGO_USER_NAME_KEY)
+ YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_USER_NAME_KEY)
.withHttpSpnegoKeytabKey(
- YarnConfiguration.AHS_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
+ YarnConfiguration.TIMELINE_SERVICE_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
.at(bindAddress)
.start(new AHSWebApp(historyManager, timelineStore));
} catch (Exception e) {
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java Sun Feb 23 02:05:28 2014
@@ -113,7 +113,7 @@ public class FileSystemApplicationHistor
@Override
public void serviceInit(Configuration conf) throws Exception {
Path fsWorkingPath =
- new Path(conf.get(YarnConfiguration.FS_HISTORY_STORE_URI));
+ new Path(conf.get(YarnConfiguration.FS_APPLICATION_HISTORY_STORE_URI));
rootDirPath = new Path(fsWorkingPath, ROOT_DIR_NAME);
try {
fs = fsWorkingPath.getFileSystem(conf);
@@ -727,8 +727,8 @@ public class FileSystemApplicationHistor
fs.setPermission(historyFile, HISTORY_FILE_UMASK);
writer =
new TFile.Writer(fsdos, MIN_BLOCK_SIZE, getConfig().get(
- YarnConfiguration.FS_HISTORY_STORE_COMPRESSION_TYPE,
- YarnConfiguration.DEFAULT_FS_HISTORY_STORE_COMPRESSION_TYPE), null,
+ YarnConfiguration.FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE,
+ YarnConfiguration.DEFAULT_FS_APPLICATION_HISTORY_STORE_COMPRESSION_TYPE), null,
getConfig());
}
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java Sun Feb 23 02:05:28 2014
@@ -57,7 +57,7 @@ public class TestApplicationHistoryClien
public void setup() {
historyServer = new ApplicationHistoryServer();
Configuration config = new YarnConfiguration();
- config.setClass(YarnConfiguration.AHS_STORE,
+ config.setClass(YarnConfiguration.APPLICATION_HISTORY_STORE,
MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
historyServer.init(config);
historyServer.start();
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryManagerImpl.java Sun Feb 23 02:05:28 2014
@@ -38,7 +38,7 @@ public class TestApplicationHistoryManag
@Before
public void setup() throws Exception {
Configuration config = new Configuration();
- config.setClass(YarnConfiguration.AHS_STORE,
+ config.setClass(YarnConfiguration.APPLICATION_HISTORY_STORE,
MemoryApplicationHistoryStore.class, ApplicationHistoryStore.class);
applicationHistoryManagerImpl = new ApplicationHistoryManagerImpl();
applicationHistoryManagerImpl.init(config);
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java Sun Feb 23 02:05:28 2014
@@ -52,7 +52,7 @@ public class TestFileSystemApplicationHi
fs.initialize(new URI("/"), conf);
fsWorkingPath = new Path("Test");
fs.delete(fsWorkingPath, true);
- conf.set(YarnConfiguration.FS_HISTORY_STORE_URI, fsWorkingPath.toString());
+ conf.set(YarnConfiguration.FS_APPLICATION_HISTORY_STORE_URI, fsWorkingPath.toString());
store = new FileSystemApplicationHistoryStore();
store.init(conf);
store.start();
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java Sun Feb 23 02:05:28 2014
@@ -36,6 +36,7 @@ import org.apache.hadoop.yarn.event.Even
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryStore;
import org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryWriter;
+import org.apache.hadoop.yarn.server.applicationhistoryservice.FileSystemApplicationHistoryStore;
import org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore;
import org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationAttemptFinishData;
import org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationAttemptStartData;
@@ -81,8 +82,8 @@ public class RMApplicationHistoryWriter
protected synchronized void serviceInit(Configuration conf) throws Exception {
historyServiceEnabled =
- conf.getBoolean(YarnConfiguration.YARN_HISTORY_SERVICE_ENABLED,
- YarnConfiguration.DEFAULT_YARN_HISTORY_SERVICE_ENABLED);
+ conf.getBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED,
+ YarnConfiguration.DEFAULT_APPLICATION_HISTORY_ENABLED);
writer = createApplicationHistoryStore(conf);
addIfService(writer);
@@ -112,14 +113,15 @@ public class RMApplicationHistoryWriter
if (historyServiceEnabled) {
try {
Class<? extends ApplicationHistoryStore> storeClass =
- conf.getClass(YarnConfiguration.RM_HISTORY_WRITER_CLASS,
- NullApplicationHistoryStore.class, ApplicationHistoryStore.class);
+ conf.getClass(YarnConfiguration.APPLICATION_HISTORY_STORE,
+ FileSystemApplicationHistoryStore.class,
+ ApplicationHistoryStore.class);
return storeClass.newInstance();
} catch (Exception e) {
String msg =
"Could not instantiate ApplicationHistoryWriter: "
- + conf.get(YarnConfiguration.RM_HISTORY_WRITER_CLASS,
- NullApplicationHistoryStore.class.getName());
+ + conf.get(YarnConfiguration.APPLICATION_HISTORY_STORE,
+ FileSystemApplicationHistoryStore.class.getName());
LOG.error(msg, e);
throw new YarnRuntimeException(msg, e);
}
@@ -214,21 +216,25 @@ public class RMApplicationHistoryWriter
@SuppressWarnings("unchecked")
public void applicationStarted(RMApp app) {
- dispatcher.getEventHandler().handle(
- new WritingApplicationStartEvent(app.getApplicationId(),
- ApplicationStartData.newInstance(app.getApplicationId(), app.getName(),
- app.getApplicationType(), app.getQueue(), app.getUser(),
- app.getSubmitTime(), app.getStartTime())));
+ if (historyServiceEnabled) {
+ dispatcher.getEventHandler().handle(
+ new WritingApplicationStartEvent(app.getApplicationId(),
+ ApplicationStartData.newInstance(app.getApplicationId(), app.getName(),
+ app.getApplicationType(), app.getQueue(), app.getUser(),
+ app.getSubmitTime(), app.getStartTime())));
+ }
}
@SuppressWarnings("unchecked")
public void applicationFinished(RMApp app, RMAppState finalState) {
- dispatcher.getEventHandler().handle(
- new WritingApplicationFinishEvent(app.getApplicationId(),
- ApplicationFinishData.newInstance(app.getApplicationId(),
- app.getFinishTime(), app.getDiagnostics().toString(),
- app.getFinalApplicationStatus(),
- RMServerUtils.createApplicationState(finalState))));
+ if (historyServiceEnabled) {
+ dispatcher.getEventHandler().handle(
+ new WritingApplicationFinishEvent(app.getApplicationId(),
+ ApplicationFinishData.newInstance(app.getApplicationId(),
+ app.getFinishTime(), app.getDiagnostics().toString(),
+ app.getFinalApplicationStatus(),
+ RMServerUtils.createApplicationState(finalState))));
+ }
}
@SuppressWarnings("unchecked")
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java?rev=1570949&r1=1570948&r2=1570949&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java Sun Feb 23 02:05:28 2014
@@ -77,7 +77,7 @@ public class TestRMApplicationHistoryWri
public void setup() {
store = new MemoryApplicationHistoryStore();
Configuration conf = new Configuration();
- conf.setBoolean(YarnConfiguration.YARN_HISTORY_SERVICE_ENABLED, true);
+ conf.setBoolean(YarnConfiguration.APPLICATION_HISTORY_ENABLED, true);
writer = new RMApplicationHistoryWriter() {
@Override